Merge pull request #6 from vharseko/master

FIX agentadmin class path exceptions

Author: spetix

OpenAM

@@ -30,17 +30,11 @@
 
 # Portions Copyrighted 2010-2013 ForgeRock AS.
 
-if [[ $# -ge 1 ]] && [[ $1 == "debug" ]] ; then
-   echo "Enabled debug mode"
-   shift
-   JAVA_OPTS=-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005:${JAVA_OPTS}
-fi
-
 if [ -z "$AGENT_HOME" ]; then
     AGENT_HOME=`dirname $0`/..
 fi
 
-if [ -z "$JAVA_HOME" ]; then
+if [ -z "$JAVA_HOME/bin/java" ]; then
     JAVA_VM=java
 else
     JAVA_VM=\${JAVA_HOME}/bin/java
@@ -55,6 +49,6 @@ else
     AGENT_OPTS=
 fi
 
-AGENT_CLASSPATH=${AGENT_HOME}/lib/openam-installtools-${openam.version}.jar:${AGENT_HOME}/lib/commons-io-1.4.jar:${AGENT_HOME}/locale:${AGENT_HOME}/lib/openssoclientsdk.jar:${AGENT_HOME}/lib/agent.jar
+AGENT_CLASSPATH=\${AGENT_HOME}/lib/openam-installtools-launcher-${openam.version}.jar:\${AGENT_HOME}/lib/commons-io-1.4.jar
 
-$JAVA_VM ${JAVA_OPTS} -cp $AGENT_CLASSPATH $AGENT_OPTS com.sun.identity.install.tools.launch.AdminToolLauncher $*
+$JAVA_VM -classpath "$AGENT_CLASSPATH"  $AGENT_OPTS com.sun.identity.install.tools.launch.AdminToolLauncher $*

jee-agents-distribution/src/main/assembly/scripts/agentadmin

@@ -147,5 +147,9 @@
             <groupId>org.forgerock.openam</groupId>
             <artifactId>openam-installtools</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.forgerock.openam</groupId>
+            <artifactId>openam-installtools-launcher</artifactId>
+        </dependency>
     </dependencies>
 </project>

jee-agents-sdk/pom.xml

@@ -27,7 +27,7 @@
     <version>4.0.6-SNAPSHOT</version>
     <packaging>pom</packaging>
     <properties>
-        <openam.version>14.1.17-SNAPSHOT</openam.version>
+        <openam.version>14.2.2-SNAPSHOT</openam.version>
 <!--         <websphere.libraries.v61.system.path>/var/tmp/extlib/websphere/v61</websphere.libraries.v61.system.path> -->
 <!--         <com.ibm.ws.runtime.v61.version>6.1.0</com.ibm.ws.runtime.v61.version> -->
 <!--         <weblogic.libraries.v10.system.path>/var/tmp/extlib/weblogic/v10</weblogic.libraries.v10.system.path> -->
@@ -87,10 +87,14 @@
                     <version>2.3</version>
                 </plugin>
                 <plugin>
-		        		<groupId>org.apache.maven.plugins</groupId>
-		        		<artifactId>maven-release-plugin</artifactId>
-		        		<version>2.5.3</version>
+	        		<groupId>org.apache.maven.plugins</groupId>
+	        		<artifactId>maven-release-plugin</artifactId>
+	        		<version>2.5.3</version>
 		      	</plugin>
+		      	<plugin>
+		          <artifactId>maven-assembly-plugin</artifactId>
+		          <version>3.1.1</version>
+		        </plugin>
             </plugins>
         </pluginManagement>
     </build>