Merge branch 'release/1.0'

SoftSmithy · Nov 2, 2018 · 83b68a8 · 83b68a8
2 parents f1d8b2d + 07ddf79
commit 83b68a8
Show file tree

Hide file tree

Showing 226 changed files with 3,248 additions and 2,523 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,2 @@
-softsmithy-lib
-==============
-
+# SoftSmithy Utility Library
 A Java utility library.
diff --git a/nbactions.xml b/nbactions.xml
@@ -6,6 +6,7 @@
             <goals>
                 <goal>clean</goal>
                 <goal>install</goal>
+                <goal>-DperformRelease=true</goal>
             </goals>
             <activatedProfiles>
                 <activatedProfile>sonatype-oss-release</activatedProfile>
@@ -17,6 +18,7 @@
             <goals>
                 <goal>site:site</goal>
                 <goal>site:stage</goal>
+                <goal>-DperformRelease=true</goal>
             </goals>
         </action>
         <action>
@@ -25,6 +27,7 @@
             <goals>
                 <goal>site-deploy</goal>
                 <goal>-Dusername=puce</goal>
+                <goal>-DperformRelease=true</goal>
             </goals>
             <activatedProfiles>
                 <activatedProfile>sonatype-oss-release</activatedProfile>

diff --git a/pom.xml b/pom.xml
@@ -17,18 +17,18 @@ Contributor(s): .
     <parent>
         <groupId>org.softsmithy.lib</groupId>
         <artifactId>softsmithy-lib-parent</artifactId>
-        <version>0.9</version>
+        <version>1.0</version>
         <relativePath>softsmithy-lib-parent/pom.xml</relativePath>
     </parent>
 
-    <artifactId>softsmithy-lib-all</artifactId>
+    <artifactId>softsmithy-lib</artifactId>
     <packaging>pom</packaging>
 
-    <name>SoftSmithy Utility Library - All</name>
+    <name>SoftSmithy Utility Library</name>
     <description>A Java utility library.</description>
     <inceptionYear>2002</inceptionYear>
     <!-- required for Javadoc (apidocs) linking -->
-    <url>http://www.softsmithy.org/softsmithy-lib/lib/${project.version}/docs/site</url>
+    <url>https://www.softsmithy.org/softsmithy-lib/lib/${project.version}/docs/site</url>
 
     <scm>
         <connection>${scm.connection}</connection>
@@ -65,6 +65,58 @@ Contributor(s): .
         <module>softsmithy-lib-docs</module>
     </modules>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>softsmithy-lib-core</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>softsmithy-lib-compiler</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>softsmithy-lib-beans</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>softsmithy-lib-awt</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>softsmithy-lib-swing</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>softsmithy-lib-swing-customizer</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>softsmithy-lib-persistence</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>softsmithy-lib-time</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.softsmithy.devlib</groupId>
+                <artifactId>softsmithy-devlib</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <build>
         <plugins>
             <plugin>

diff --git a/softsmithy-devlib/pom.xml b/softsmithy-devlib/pom.xml
@@ -17,19 +17,19 @@ Contributor(s): .
     <parent>
         <groupId>org.softsmithy.lib</groupId>
         <artifactId>softsmithy-lib-parent</artifactId>
-        <version>0.9</version>
+        <version>1.0</version>
         <relativePath>../softsmithy-lib-parent/pom.xml</relativePath>
     </parent>
 
     <groupId>org.softsmithy.devlib</groupId>
-    <artifactId>softsmithy-devlib-all</artifactId>
+    <artifactId>softsmithy-devlib</artifactId>
     <packaging>pom</packaging>
 
-    <name>SoftSmithy Development Utility Library - All</name>
+    <name>SoftSmithy Development Utility Library</name>
     <description>A Java development utility library.</description>
     <inceptionYear>2010</inceptionYear>
     <!-- required for Javadoc (apidocs) linking -->
-    <url>http://www.softsmithy.org/softsmithy-lib/devlib/${project.version}/docs/site</url>
+    <url>https://www.softsmithy.org/softsmithy-lib/devlib/${project.version}/docs/site</url>
 
     <scm>
         <connection>${scm.connection}</connection>
@@ -56,6 +56,16 @@ Contributor(s): .
         <module>softsmithy-devlib-core</module>
     </modules>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>softsmithy-devlib-core</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <build>
         <plugins>
             <plugin>

diff --git a/softsmithy-devlib/softsmithy-devlib-core/pom.xml b/softsmithy-devlib/softsmithy-devlib-core/pom.xml
@@ -18,7 +18,7 @@ Contributor(s): .
     <parent>
         <groupId>org.softsmithy.lib</groupId>
         <artifactId>softsmithy-lib-parent</artifactId>
-        <version>0.9</version>
+        <version>1.0</version>
         <relativePath>../../softsmithy-lib-parent/pom.xml</relativePath>
     </parent>
 
@@ -30,7 +30,7 @@ Contributor(s): .
     <description>A Java development utility library.</description>
     <inceptionYear>2010</inceptionYear>
     <!-- required for Javadoc (apidocs) linking -->
-    <url>http://www.softsmithy.org/softsmithy-lib/devlib/${project.version}/docs/site</url>
+    <url>https://www.softsmithy.org/softsmithy-lib/devlib/${project.version}/docs/site</url>
 
     <scm>
         <connection>${scm.connection}</connection>
@@ -65,6 +65,17 @@ Contributor(s): .
                 <artifactId>maven-bundle-plugin</artifactId>
                 <extensions>true</extensions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <Automatic-Module-Name>org.softsmithy.devlib.core</Automatic-Module-Name>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
         </plugins>    
     </build>
 

diff --git a/softsmithy-devlib/softsmithy-devlib-core/src/main/docs/index.html b/softsmithy-devlib/softsmithy-devlib-core/src/main/docs/index.html
@@ -1,14 +1,14 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <!--
-                   Sun Public License Notice
+          COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Notice
  
-  The contents of this file are subject to the Sun Public License
+  The contents of this file are subject to the COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL)
   Version 1.0 (the "License"); you may not use this file except in
   compliance with the License. A copy of the License is available at
-  http://www.sun.com/
+  http://www.opensource.org/licenses/cddl1.txt
  
-  The Original Text is SoftSmithy Utility Library Tutorial. The Initial Author of the
-  Original Text is Florian Brunner (Sourceforge.net user: puce). All Rights Reserved.
+  The Original Code is SoftSmithy.org. The Initial Developer of the
+  Original Code is Florian Brunner (GitHub user: puce77). All Rights Reserved.
  
   Contributor(s): .
 -->

diff --git a/...smithy-devlib/softsmithy-devlib-core/src/main/java/org/softsmithy/devlib/junit/Tests.java b/...smithy-devlib/softsmithy-devlib-core/src/main/java/org/softsmithy/devlib/junit/Tests.java
@@ -7,7 +7,7 @@
  * http://www.opensource.org/licenses/cddl1.txt
  *
  * The Original Code is SoftSmithy Utility Library. The Initial Developer of the
- * Original Code is Florian Brunner (Sourceforge.net user: puce). All Rights Reserved.
+ * Original Code is Florian Brunner (GitHub user: puce77). All Rights Reserved.
  *
  * Contributor(s): .
  */

diff --git a/...devlib/softsmithy-devlib-core/src/main/java/org/softsmithy/devlib/junit/package-info.java b/...devlib/softsmithy-devlib-core/src/main/java/org/softsmithy/devlib/junit/package-info.java
@@ -0,0 +1,17 @@
+/*
+ *         COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Notice
+ *
+ * The contents of this file are subject to the COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL)
+ * Version 1.0 (the "License"); you may not use this file except in
+ * compliance with the License. A copy of the License is available at
+ * http://www.opensource.org/licenses/cddl1.txt
+ *
+ * The Original Code is SoftSmithy Utility Library. The Initial Developer of the
+ * Original Code is Florian Brunner (GitHub user: puce77). All Rights Reserved.
+ *
+ * Contributor(s): .
+ */
+/**
+ * Utility classes and extensions for JUnit tests.
+ */
+package org.softsmithy.devlib.junit;
diff --git a/...hy-devlib-core/src/main/java/org/softsmithy/devlib/junit/persistence/AbstractJPATest.java b/...hy-devlib-core/src/main/java/org/softsmithy/devlib/junit/persistence/AbstractJPATest.java
@@ -7,7 +7,7 @@
  * http://www.opensource.org/licenses/cddl1.txt
  *
  * The Original Code is SoftSmithy Utility Library. The Initial Developer of the
- * Original Code is Florian Brunner (Sourceforge.net user: puce). All Rights Reserved.
+ * Original Code is Florian Brunner (GitHub user: puce77). All Rights Reserved.
  *
  * Contributor(s): .
  */

diff --git a/...mithy-devlib-core/src/main/java/org/softsmithy/devlib/junit/persistence/package-info.java b/...mithy-devlib-core/src/main/java/org/softsmithy/devlib/junit/persistence/package-info.java
@@ -0,0 +1,17 @@
+/*
+ *         COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Notice
+ *
+ * The contents of this file are subject to the COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL)
+ * Version 1.0 (the "License"); you may not use this file except in
+ * compliance with the License. A copy of the License is available at
+ * http://www.opensource.org/licenses/cddl1.txt
+ *
+ * The Original Code is SoftSmithy Utility Library. The Initial Developer of the
+ * Original Code is Florian Brunner (GitHub user: puce77). All Rights Reserved.
+ *
+ * Contributor(s): .
+ */
+/**
+ * Utility classes and extensions for JPA JUnit tests.
+ */
+package org.softsmithy.devlib.junit.persistence;
diff --git a/.../softsmithy-devlib-core/src/main/java/org/softsmithy/devlib/persistence/package-info.java b/.../softsmithy-devlib-core/src/main/java/org/softsmithy/devlib/persistence/package-info.java
@@ -0,0 +1,17 @@
+/*
+ *         COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Notice
+ *
+ * The contents of this file are subject to the COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL)
+ * Version 1.0 (the "License"); you may not use this file except in
+ * compliance with the License. A copy of the License is available at
+ * http://www.opensource.org/licenses/cddl1.txt
+ *
+ * The Original Code is SoftSmithy Utility Library. The Initial Developer of the
+ * Original Code is Florian Brunner (GitHub user: puce77). All Rights Reserved.
+ *
+ * Contributor(s): .
+ */
+/**
+ * Utility classes and extensions for JPA.
+ */
+package org.softsmithy.devlib.persistence;
diff --git a/softsmithy-devlib/src/main/assembly/dist.xml b/softsmithy-devlib/src/main/assembly/dist.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1 http://maven.apache.org/xsd/assembly-1.1.1.xsd">
+<assembly xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
+          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
     <id>dist</id>
     <formats>
         <format>tar.gz</format>

diff --git a/softsmithy-lib-awt/pom.xml b/softsmithy-lib-awt/pom.xml
@@ -17,7 +17,7 @@ Contributor(s): .
     <parent>
         <groupId>org.softsmithy.lib</groupId>
         <artifactId>softsmithy-lib-parent</artifactId>
-        <version>0.9</version>
+        <version>1.0</version>
         <relativePath>../softsmithy-lib-parent/pom.xml</relativePath>
     </parent>
 
@@ -28,7 +28,7 @@ Contributor(s): .
     <description>An AWT utility library.</description>
     <inceptionYear>2012</inceptionYear>
     <!-- required for Javadoc (apidocs) linking -->
-    <url>http://www.softsmithy.org/softsmithy-lib/lib/${project.version}/docs/site</url>
+    <url>https://www.softsmithy.org/softsmithy-lib/lib/${project.version}/docs/site</url>
 
     <scm>
         <connection>${scm.connection}</connection>
@@ -64,6 +64,17 @@ Contributor(s): .
                 <artifactId>maven-bundle-plugin</artifactId>
                 <extensions>true</extensions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <Automatic-Module-Name>org.softsmithy.lib.awt</Automatic-Module-Name>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
         </plugins>    
     </build>
 
@@ -74,6 +85,10 @@ Contributor(s): .
             <artifactId>softsmithy-lib-core</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

diff --git a/softsmithy-lib-awt/src/main/java/org/softsmithy/lib/awt/ImageWrapper.java b/softsmithy-lib-awt/src/main/java/org/softsmithy/lib/awt/ImageWrapper.java
@@ -30,7 +30,7 @@
 class ImageWrapper extends Image {
 
   /** Holds value of property image. */
-  private Image image;
+  private final Image image;
 
   /** Creates a new instance of ImageWrapper */
   public ImageWrapper(Image image) {
@@ -47,6 +47,7 @@ public ImageWrapper(Image image) {
    * @see       java.awt.image.ImageObserver
    *
    */
+  @Override
   public int getWidth(ImageObserver observer) {
     return image.getWidth(observer);
   }
@@ -94,6 +95,7 @@ public Image getScaledInstance(int width, int height, int hints) {
    * have only one copy of their data.
    *
    */
+  @Override
   public void flush() {
     image.flush();
   }
@@ -105,6 +107,7 @@ public void flush() {
    * @see     java.awt.Component#createImage(int, int)
    *
    */
+  @Override
   public Graphics getGraphics() {
     return image.getGraphics();
   }
@@ -117,6 +120,7 @@ public Graphics getGraphics() {
    * @see        java.awt.image.ImageProducer
    *
    */
+  @Override
   public ImageProducer getSource() {
     return image.getSource();
   }
@@ -131,6 +135,7 @@ public ImageProducer getSource() {
    * @see       java.awt.image.ImageObserver
    *
    */
+  @Override
   public int getHeight(ImageObserver observer) {
     return image.getHeight(observer);
   }
@@ -155,6 +160,7 @@ public int getHeight(ImageObserver observer) {
    * @see         java.awt.Image#UndefinedProperty
    *
    */
+  @Override
   public Object getProperty(String name, ImageObserver observer) {
     return image.getProperty(name, observer);
   }