You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by at...@apache.org on 2008/10/08 01:05:27 UTC
svn commit: r702662 - in
/portals/jetspeed-2/portal/branches/security-refactoring:
applications/jetspeed-demo/jetspeed-mvn-demo-pom.xml
applications/jetspeed-demo/pom.xml pom.xml
Author: ate
Date: Tue Oct 7 16:05:26 2008
New Revision: 702662
URL: http://svn.apache.org/viewvc?rev=702662&view=rev
Log:
Improve the jetspeed-demo deployment configuration:
- the standard war build contents now is no longer dependent on which profile is used (dbpsml configuration no longer embedded)
- the standard war build no longer embeds the Tomcat context.xml
- much simpler and cleaner standard pom.xml as result (only adding embedded jetspeed-layouts.war in its WEB-INF/deploy/local folder)
- the (optional) dbpsml Spring categories filter key configuration is now directly *deployed* through a profile
- the Tomcat context.xml is now also directly *deployed*
Modified:
portals/jetspeed-2/portal/branches/security-refactoring/applications/jetspeed-demo/jetspeed-mvn-demo-pom.xml
portals/jetspeed-2/portal/branches/security-refactoring/applications/jetspeed-demo/pom.xml
portals/jetspeed-2/portal/branches/security-refactoring/pom.xml
Modified: portals/jetspeed-2/portal/branches/security-refactoring/applications/jetspeed-demo/jetspeed-mvn-demo-pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/applications/jetspeed-demo/jetspeed-mvn-demo-pom.xml?rev=702662&r1=702661&r2=702662&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/applications/jetspeed-demo/jetspeed-mvn-demo-pom.xml (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/applications/jetspeed-demo/jetspeed-mvn-demo-pom.xml Tue Oct 7 16:05:26 2008
@@ -185,6 +185,51 @@
<plugins>
<plugin>
<groupId>org.apache.portals.jetspeed-2</groupId>
+ <artifactId>jetspeed-unpack-maven-plugin</artifactId>
+ <version>${org.apache.portals.jetspeed.version}</version>
+ <executions>
+ <execution>
+ <id>unpack-appserver</id>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <phase>generate-resources</phase>
+ <configuration>
+ <unpack>
+ <artifact>org.apache.portals.jetspeed-2:jetspeed-portal-resources:jar</artifact>
+ <resources>
+ <resource>
+ <path>conf</path>
+ <include>tomcat/context.xml</include>
+ </resource>
+ </resources>
+ </unpack>
+ </configuration>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.portals.jetspeed-2</groupId>
+ <artifactId>jetspeed-portal-resources</artifactId>
+ <version>${org.apache.portals.jetspeed.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>resources</id>
+ <goals>
+ <goal>resources</goal>
+ </goals>
+ <phase>process-resources</phase>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.portals.jetspeed-2</groupId>
<artifactId>jetspeed-deploy-maven-plugin</artifactId>
<version>${org.apache.portals.jetspeed.version}</version>
<executions>
@@ -197,6 +242,9 @@
<configuration>
<targetBaseDir>${org.apache.jetspeed.server.home}</targetBaseDir>
<portalName>${org.apache.jetspeed.portal.context.name}</portalName>
+ <destinations>
+ <context>webapps/${org.apache.jetspeed.portal.context.name}/META-INF</context>
+ </destinations>
<deployments>
<!-- shared/lib -->
<deployment>
@@ -225,6 +273,11 @@
<targetName>${org.apache.jetspeed.portal.context.name}</targetName>
<delete>./${org.apache.jetspeed.portal.context.name}</delete>
</deployment>
+ <!-- demo portal tomcat context -->
+ <deployment>
+ <file>${project.build.directory}/resources/tomcat/context.xml</file>
+ <destination>context</destination>
+ </deployment>
<!-- admin pa -->
<deployment>
<artifact>org.apache.portals.jetspeed-2:j2-admin:war</artifact>
@@ -337,9 +390,59 @@
</dependencies>
</plugin>
</plugins>
+ <resources>
+ <resource>
+ <directory>${project.build.directory}/tomcat</directory>
+ <targetPath>../resources/tomcat</targetPath>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
</build>
</profile>
+ <profile>
+ <id>deploy-dbpsml</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.portals.jetspeed-2</groupId>
+ <artifactId>jetspeed-deploy-maven-plugin</artifactId>
+ <version>${org.apache.portals.jetspeed.version}</version>
+ <executions>
+ <execution>
+ <id>deploy</id>
+ <goals>
+ <goal>deploy</goal>
+ </goals>
+ <phase>process-resources</phase>
+ <configuration>
+ <targetBaseDir>${org.apache.jetspeed.server.home}</targetBaseDir>
+ <portalName>${org.apache.jetspeed.portal.context.name}</portalName>
+ <destinations>
+ <conf>webapps/${org.apache.jetspeed.portal.context.name}/WEB-INF/conf</conf>
+ </destinations>
+ <deployments>
+ <deployment>
+ <file>${basedir}/src/etc/dbpsml/spring-filter-key.properties</file>
+ <destination>conf</destination>
+ </deployment>
+ </deployments>
+ </configuration>
+ </execution>
+ </executions>
+ <dependencies>
+ <!-- plugin own dependencies -->
+ <dependency>
+ <groupId>org.apache.portals.jetspeed-2</groupId>
+ <artifactId>jetspeed-deploy-tools</artifactId>
+ <version>${org.apache.portals.jetspeed.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
</profiles>
</project>
Modified: portals/jetspeed-2/portal/branches/security-refactoring/applications/jetspeed-demo/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/applications/jetspeed-demo/pom.xml?rev=702662&r1=702661&r2=702662&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/applications/jetspeed-demo/pom.xml (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/applications/jetspeed-demo/pom.xml Tue Oct 7 16:05:26 2008
@@ -61,39 +61,6 @@
<plugins>
<plugin>
<groupId>org.apache.portals.jetspeed-2</groupId>
- <artifactId>jetspeed-unpack-maven-plugin</artifactId>
- <version>${org.apache.portals.jetspeed.version}</version>
- <executions>
- <execution>
- <id>unpack-appserver</id>
- <goals>
- <goal>unpack</goal>
- </goals>
- <phase>process-resources</phase>
- <configuration>
- <unpack>
- <artifact>org.apache.portals.jetspeed-2:jetspeed-portal-resources:jar</artifact>
- <targetDirectory>${project.build.directory}/resources/META-INF</targetDirectory>
- <resources>
- <resource>
- <path>conf/tomcat</path>
- <include>context.xml</include>
- </resource>
- </resources>
- </unpack>
- </configuration>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>org.apache.portals.jetspeed-2</groupId>
- <artifactId>jetspeed-portal-resources</artifactId>
- <version>${org.apache.portals.jetspeed.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- <plugin>
- <groupId>org.apache.portals.jetspeed-2</groupId>
<artifactId>jetspeed-deploy-maven-plugin</artifactId>
<version>${org.apache.portals.jetspeed.version}</version>
<executions>
@@ -126,38 +93,7 @@
</dependency>
</dependencies>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.0.2</version>
- <configuration>
- <warName>${pom.artifactId}</warName>
- <webResources>
- <resource>
- <directory>${project.build.directory}/resources</directory>
- <filtering>true</filtering>
- </resource>
- </webResources>
- </configuration>
- </plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>dbpsml</id>
- <build>
- <resources>
- <resource>
- <directory>${basedir}/src/etc/dbpsml</directory>
- <includes>
- <include>spring-filter-key.properties</include>
- </includes>
- <targetPath>../${project.build.finalName}/WEB-INF/conf</targetPath>
- </resource>
- </resources>
- </build>
- </profile>
- </profiles>
-
+
</project>
Modified: portals/jetspeed-2/portal/branches/security-refactoring/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/pom.xml?rev=702662&r1=702661&r2=702662&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/pom.xml (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/pom.xml Tue Oct 7 16:05:26 2008
@@ -1358,11 +1358,6 @@
<dir>@rootdir@/applications/jetspeed-demo</dir>
</target>
<target>
- <id>demo-dbpsml-install</id>
- <dir>@rootdir@/applications/jetspeed-demo</dir>
- <profiles>dbpsml</profiles>
- </target>
- <target>
<id>demo-seed</id>
<name>demo</name>
<dir>@rootdir@/applications/jetspeed-demo</dir>
@@ -1382,6 +1377,12 @@
<profiles>deploy</profiles>
</target>
<target>
+ <id>demo-deploy-dbpsml</id>
+ <name>demo</name>
+ <dir>@rootdir@/applications/jetspeed-demo</dir>
+ <profiles>deploy-dbpsml</profiles>
+ </target>
+ <target>
<id>demo-db</id>
<depends>proddb,demo-seed</depends>
</target>
@@ -1395,7 +1396,7 @@
</target>
<target>
<id>demo-dbpsml</id>
- <depends>demo-dbpsml-install,demo-db-psml,demo-deploy</depends>
+ <depends>demo-db-psml,demo-deploy,demo-deploy-dbpsml</depends>
</target>
</targets>
</configuration>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org