Author: sohil.shah(a)jboss.com
Date: 2009-11-17 13:46:02 -0500 (Tue, 17 Nov 2009)
New Revision: 13841
Removed:
jbossexo/modules/sso/trunk/agent/src/main/config/cas/
jbossexo/modules/sso/trunk/agent/src/main/config/jboss/
jbossexo/modules/sso/trunk/gatein-cas-plugin/src/main/config/
Modified:
jbossexo/modules/sso/trunk/agent/pom.xml
jbossexo/modules/sso/trunk/gatein-cas-plugin/pom.xml
jbossexo/modules/sso/trunk/gatein-josso-plugin/pom.xml
jbossexo/modules/sso/trunk/packaging/cas/
Log:
maven cleanup
Modified: jbossexo/modules/sso/trunk/agent/pom.xml
===================================================================
--- jbossexo/modules/sso/trunk/agent/pom.xml 2009-11-17 18:37:47 UTC (rev 13840)
+++ jbossexo/modules/sso/trunk/agent/pom.xml 2009-11-17 18:46:02 UTC (rev 13841)
@@ -92,6 +92,10 @@
</build>
</profile>
+ <!--
+ TODO: move this into packaging module
+ -->
+ <!--
<profile>
<id>josso-agent</id>
<build>
@@ -107,19 +111,19 @@
<tasks>
<echo message="Preparing the JOSSO Agent for GateIn"/>
- <!-- setup the directory for josso agent artifact -->
+
<delete dir="${basedir}/target/josso"/>
<mkdir dir="${basedir}/target/josso"/>
<unjar
src="${settings.localRepository}/org/exoplatform/portal/exo.portal.web.portal/${org.exoplatform.portal.version}/exo.portal.web.portal-${org.exoplatform.portal.version}.war"
dest="${basedir}/target/josso/portal.war"
overwrite="true"/>
- <!-- override the core artifacts -->
+
<copy todir="${basedir}/target/josso/portal.war"
overwrite="true">
<fileset
dir="${basedir}/src/main/config/josso/portal.war"/>
</copy>
- <!-- jar it back up -->
+
<jar destfile="${basedir}/target/josso/02portal.war"
basedir="${basedir}/target/josso/portal.war"/>
</tasks>
</configuration>
@@ -138,18 +142,18 @@
todir="${gatein.location}/deploy/gatein.ear"
overwrite="true"/>
- <!-- Deploy the Authentication Callback RESTful service -->
+
<copy
file="${settings.localRepository}/org/gatein/sso/auth-callback/${project.version}/auth-callback-${project.version}.jar"
todir="${gatein.location}/deploy/gatein.ear/lib"
overwrite="true"/>
- <!-- Deploy the SSO Agent -->
+
<copy
file="${settings.localRepository}/org/gatein/sso/agent/${project.version}/agent-${project.version}.jar"
todir="${gatein.location}/deploy/gatein.ear/lib"
overwrite="true"/>
- <!-- Deploy JOSSO Agent dependencies -->
+
<copy
file="${settings.localRepository}/org/josso/josso-agent/${version.josso}/josso-agent-${version.josso}.jar"
todir="${gatein.location}/deploy/gatein.ear/lib"
overwrite="true"/>
@@ -184,6 +188,7 @@
</plugins>
</build>
</profile>
+ -->
</profiles>
</project>
Modified: jbossexo/modules/sso/trunk/gatein-cas-plugin/pom.xml
===================================================================
--- jbossexo/modules/sso/trunk/gatein-cas-plugin/pom.xml 2009-11-17 18:37:47 UTC (rev
13840)
+++ jbossexo/modules/sso/trunk/gatein-cas-plugin/pom.xml 2009-11-17 18:46:02 UTC (rev
13841)
@@ -55,76 +55,7 @@
</plugin>
</plugins>
</build>
- </profile>
- <profile>
- <id>plugin-tomcat-deploy</id>
- <properties>
- <!-- ChangeMe to your specific local environment -->
-
<tomcat60.cas.location>/home/soshah/projects/gatein/runtime/tomcat-cas-3.3.4</tomcat60.cas.location>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.jvnet.maven-antrun-extended-plugin</groupId>
- <artifactId>maven-antrun-extended-plugin</artifactId>
- <executions>
- <execution>
- <id>plugin-tomcat-package</id>
- <phase>package</phase>
- <configuration>
- <tasks>
- <echo message="Preparing the CAS Plugin for Tomcat
6.0.2......"/>
-
- <!-- setup the directory for the plugin artifacts -->
- <delete dir="${basedir}/target/plugin"/>
- <mkdir dir="${basedir}/target/plugin"/>
-
- <!-- prepare the plugin configuration -->
- <copy
todir="${basedir}/target/plugin/webapps/cas/WEB-INF">
- <fileset dir="${basedir}/src/main/config/WEB-INF"/>
- </copy>
-
- <!-- prepare the plugin jar -->
- <copy
tofile="${basedir}/target/plugin/webapps/cas/WEB-INF/lib/gatein-cas-plugin.jar"
-
file="${basedir}/target/gatein-cas-plugin-${project.version}.jar"
- overwrite="true"/>
-
- <!-- copy thirdparty dependency -->
- <copy
tofile="${basedir}/target/plugin/webapps/cas/WEB-INF/lib/commons-httpclient.jar"
-
file="${settings.localRepository}/commons-httpclient/commons-httpclient/${version.commons-httpclient}/commons-httpclient-${version.commons-httpclient}.jar"
- overwrite="true"/>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- <execution>
- <id>plugin-tomcat-install</id>
- <phase>install</phase>
- <configuration>
- <tasks>
- <echo message="Starting CAS Plugin Deployment into Tomcat
6.0.2......"/>
-
- <!-- jar plugin -->
- <jar destfile="${basedir}/target/plugin.jar"
basedir="${basedir}/target/plugin"/>
-
- <!-- explode the jar to install the plugin -->
- <unjar src="${basedir}/target/plugin.jar"
dest="${tomcat60.cas.location}" overwrite="true"/>
-
- <!-- cleanup -->
- <delete dir="${tomcat60.cas.location}/META-INF"/>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
+ </profile>
</profiles>
</project>
Modified: jbossexo/modules/sso/trunk/gatein-josso-plugin/pom.xml
===================================================================
--- jbossexo/modules/sso/trunk/gatein-josso-plugin/pom.xml 2009-11-17 18:37:47 UTC (rev
13840)
+++ jbossexo/modules/sso/trunk/gatein-josso-plugin/pom.xml 2009-11-17 18:46:02 UTC (rev
13841)
@@ -47,11 +47,14 @@
</build>
<!-- profile for packaging and deploying this plugin into a josso server -->
+ <!--
+ TODO: move this into the packaging module
+ -->
+ <!--
<profiles>
<profile>
<id>plugin-tomcat-deploy</id>
- <properties>
- <!-- ChangeMe to your specific local environment -->
+ <properties>
<tomcat60.josso.location>/home/soshah/projects/gatein/runtime/tomcat-josso-1.8.1</tomcat60.josso.location>
</properties>
<build>
@@ -66,29 +69,24 @@
<configuration>
<tasks>
<echo message="Preparing the JOSSO Plugin for Tomcat
6.0.2......"/>
-
- <!-- setup the directory for the plugin artifacts -->
+
<delete dir="${basedir}/target/plugin"/>
<mkdir dir="${basedir}/target/plugin"/>
-
- <!-- prepare the core customized configuration -->
+
<copy todir="${basedir}/target/plugin/lib">
<fileset dir="${basedir}/src/main/config">
<include name="josso-gateway-*.xml"/>
</fileset>
</copy>
-
- <!-- prepare the plugin configuration -->
+
<copy
todir="${basedir}/target/plugin/webapps/josso/WEB-INF">
<fileset dir="${basedir}/src/main/config/WEB-INF"/>
</copy>
-
- <!-- prepare the plugin jar -->
+
<copy
tofile="${basedir}/target/plugin/webapps/josso/WEB-INF/lib/gatein-josso-plugin.jar"
file="${basedir}/target/gatein-josso-plugin-${project.version}.jar"
overwrite="true"/>
-
- <!-- copy thirdparty dependency -->
+
<copy
tofile="${basedir}/target/plugin/webapps/josso/WEB-INF/lib/log4j.jar"
file="${settings.localRepository}/apache-log4j/log4j/${version.log4j}/log4j-${version.log4j}.jar"
overwrite="true"/>
@@ -105,13 +103,13 @@
<tasks>
<echo message="Starting JOSSO Plugin Deployment into Tomcat
6.0.2......"/>
- <!-- jar plugin -->
+
<jar destfile="${basedir}/target/plugin.jar"
basedir="${basedir}/target/plugin"/>
- <!-- explode the jar to install the plugin -->
+
<unjar src="${basedir}/target/plugin.jar"
dest="${tomcat60.josso.location}" overwrite="true"/>
- <!-- cleanup -->
+
<delete dir="${tomcat60.josso.location}/META-INF"/>
</tasks>
</configuration>
@@ -124,6 +122,7 @@
</plugins>
</build>
</profile>
- </profiles>
+ </profiles>
+ -->
</project>
Property changes on: jbossexo/modules/sso/trunk/packaging/cas
___________________________________________________________________
Name: svn:ignore
+ target
Show replies by date