FIX for #245

ssoadmintools setup script gives error (NoClassDefFoundError)

Author: vharseko

openam-distribution/openam-distribution-ssoadmintools/README

@@ -31,16 +31,6 @@
     <artifactId>openam-distribution-ssoadmintools</artifactId>
     <packaging>pom</packaging>
     <properties>
-        <setupArtifactIDs>
-            opendj-server,forgerock-util,json,xmlsec,openam-core,
-            openam-entitlements,openam-shared,openam-dtd-schema,openam-license-manager-cli,openam-license-core,
-            openam-audit-context,forgerock-guice-core,forgerock-guava-base,forgerock-guava-collect,guava,
-            guice,guice-assistedinject,commons-lang,commons-collections,org.apache.servicemix.bundles.javax-inject,
-            slf4j-api,slf4j-nop,opendj-core,opendj-grizzly,i18n-core,openam-ldap-utils,grizzly-framework,
-            org.openidentityplatform.commons.audit:core,openam-audit-configuration,i18n-slf4j,
-            opendj-server-legacy,opendj-config,opendj-cli,core,joda-time,
-            jackson-core,jackson-databind,jackson-annotations
-        </setupArtifactIDs>
     </properties>
 
 
@@ -86,34 +76,7 @@
                             <overWriteSnapshots>true</overWriteSnapshots>
                             <overWriteIfNewer>true</overWriteIfNewer>
                             <excludeArtifactIds>${license.artifactId},openam-rest,openam-installtools,openam-slf4j</excludeArtifactIds>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>Unix setup classpath</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>build-classpath</goal>
-                        </goals>
-                        <configuration>
-                            <fileSeparator>/</fileSeparator>
-                            <pathSeparator>:</pathSeparator>
-                            <prefix>$TOOLS_HOME/lib</prefix>
-                            <includeArtifactIds>${setupArtifactIDs}</includeArtifactIds>
-                            <outputProperty>unix.setup.classpath</outputProperty>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>Windows setup classpath</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>build-classpath</goal>
-                        </goals>
-                        <configuration>
-                            <fileSeparator>\</fileSeparator>
-                            <pathSeparator>;</pathSeparator>
-                            <prefix>%TOOLS_HOME%\lib</prefix>
-                            <includeArtifactIds>${setupArtifactIDs}</includeArtifactIds>
-                            <outputProperty>windows.setup.classpath</outputProperty>
+                            <prependGroupId>true</prependGroupId>
                         </configuration>
                     </execution>
                 </executions>

openam-distribution/openam-distribution-ssoadmintools/pom.xml

@@ -34,7 +34,7 @@
     <!-- Library Dependency -->
     <dependencySets>
         <dependencySet>
-            <outputFileNameMapping>${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+            <outputFileNameMapping>${artifact.groupId}.${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
             <outputDirectory>lib</outputDirectory>
             <includes>
                 <include>org.openidentityplatform.openam:openam-shared</include>

openam-distribution/openam-distribution-ssoadmintools/src/main/assembly/openAMToolsAssembly_Descriptor.xml

@@ -34,7 +34,7 @@
 
     <dependencySets>
         <dependencySet>
-            <outputFileNameMapping>${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+            <outputFileNameMapping>${artifact.groupId}.${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
             <outputDirectory>lib</outputDirectory>
             <includes>
                 <include>com.google.inject:guice:jar:no_aop</include>

openam-distribution/openam-distribution-ssoconfiguratortools/src/main/assembly/openAMToolsAssembly_Descriptor.xml

@@ -88,7 +88,7 @@ do
 done
 
 CLASSPATH=""
-CLASSPATH="$CLASSPATH:${unix.setup.classpath}"
+CLASSPATH="$CLASSPATH:$TOOLS_HOME/lib/*"
 CLASSPATH="$CLASSPATH:$TOOLS_HOME/resources"
 
 $JAVA_HOME/bin/java -D"load.config=yes" -D"help.print=$help_print" \

openam-distribution/src/main/amserver/scripts/tools/setup

@@ -106,7 +106,7 @@ IF "%5" == "-p" SET path_AMConfig=%~6
 IF "%5" == "--path" SET path_AMConfig=%~6
 
 set CLASSPATH="@CONFIG_DIR@"
-set CLASSPATH="%CLASSPATH%;${windows.setup.classpath}"
+set CLASSPATH="%CLASSPATH%;%TOOLS_HOME%\lib\*"
 set CLASSPATH="%CLASSPATH%;%TOOLS_HOME%\resources"
 
 "%JAVA_HOME%/bin/java.exe" -D"load.config=yes" -D"help.print=%help_print%" -D"path.AMConfig=%path_AMConfig%" -D"path.log=%path_log%" -D"path.debug=%path_debug%" -cp "%CLASSPATH%" com.sun.identity.tools.bundles.Main %accept_license%