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 2009/11/09 16:09:49 UTC
svn commit: r834100 [2/2] - in /portals/jetspeed-2/portal/trunk: ./
applications/jetspeed/ components/jetspeed-capability/
components/jetspeed-db-tools/ components/jetspeed-deploy-tools/
components/jetspeed-page-manager/ components/jetspeed-portal-site...
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-security/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-security/pom.xml?rev=834100&r1=834099&r2=834100&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-security/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-security/pom.xml Mon Nov 9 15:09:46 2009
@@ -18,184 +18,189 @@
$Id$
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
- <prerequisites>
- <maven>2.0.9</maven>
- </prerequisites>
-
- <artifactId>jetspeed-security</artifactId>
- <name>Jetspeed-2 Security Components</name>
- <description>Jetspeed-2 Security Components</description>
- <parent>
- <groupId>org.apache.portals.jetspeed-2</groupId>
- <artifactId>components</artifactId>
- <version>2.2.1-SNAPSHOT</version>
- </parent>
- <packaging>jar</packaging>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <!-- Dependencies -->
-
- <dependencies>
-
- <!-- Build Dependencies -->
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
+ <modelVersion>4.0.0</modelVersion>
+ <prerequisites>
+ <maven>2.0.9</maven>
+ </prerequisites>
+
+ <artifactId>jetspeed-security</artifactId>
+ <name>Jetspeed-2 Security Components</name>
+ <description>Jetspeed-2 Security Components</description>
+ <parent>
+ <groupId>org.apache.portals.jetspeed-2</groupId>
+ <artifactId>components</artifactId>
+ <version>2.2.1-SNAPSHOT</version>
+ </parent>
+ <packaging>jar</packaging>
+
+ <!-- Dependencies -->
+
+ <dependencies>
+
+ <!-- Build Dependencies -->
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>jetspeed-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>jetspeed-commons</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>jetspeed-rdbms</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>jetspeed-serializer</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </dependency>
+ <!-- for spring-core we require JCL -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+
+ <!-- Test Dependencies -->
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>jetspeed-file-cache</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${org.apache.jetspeed.test.jdbc.driver.groupId}</groupId>
+ <artifactId>${org.apache.jetspeed.test.jdbc.driver.artifactId}</artifactId>
+ <version>${org.apache.jetspeed.test.jdbc.driver.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <!--
+ Note: tyrex and junit is normally required only for test, but in this case, abstract test cases are included in
+ the component build... this should probably be fixed... for now, assume that junit will be provided if these test
+ classes are used.
+ -->
+ <dependency>
+ <groupId>tyrex</groupId>
+ <artifactId>tyrex</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <artifactId>spring-ldap</artifactId>
+ <groupId>org.springframework.ldap</groupId>
+ <classifier>all</classifier>
+ </dependency>
+
+ <dependency>
+ <artifactId>apacheds-server-unit</artifactId>
+ <groupId>org.apache.directory.server</groupId>
+ <version>1.5.3</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- used by Apache DS -->
+ <dependency>
+ <artifactId>slf4j-jdk14</artifactId>
+ <groupId>org.slf4j</groupId>
+ <version>1.4.3</version>
+ <scope>test</scope>
+ </dependency>
+
+
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/spi/ldap/**.java</exclude>
+ <exclude>**/spi/TestDefaultJetspeedSynchronizer.java</exclude>
+ <exclude>**/spi/TestPasswordHistoryInterceptor.java</exclude>
+ <exclude>**/spi/TestPasswordExpirationAndMaxAuthenticationFailuresInterceptor.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>jetspeed-unpack-maven-plugin</artifactId>
+ <version>${pom.version}</version>
+ <executions>
+ <execution>
+ <id>unpack-test-resources</id>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <phase>process-test-resources</phase>
+ <configuration>
+ <skip>${skipTests}</skip>
+ <unpack>
+ <targetDirectory>${project.build.testOutputDirectory}</targetDirectory>
+ <resources>
+ <resource>
+ <path>assembly</path>
+ <include>transaction.xml,security-*.xml,static-bean-references.xml,boot/datasource.xml</include>
+ </resource>
+ <resource>
+ <path>db-ojb</path>
+ </resource>
+ </resources>
+ </unpack>
+ </configuration>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-commons</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-rdbms</artifactId>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-serializer</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- </dependency>
- <!-- for spring-core we require JCL -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
+ <artifactId>jetspeed-portal-resources</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <filtering>true</filtering>
+ </testResource>
+ <testResource>
+ <directory>src/test/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </testResource>
+ </testResources>
+ </build>
- <!-- Test Dependencies -->
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-file-cache</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${org.apache.jetspeed.test.jdbc.driver.groupId}</groupId>
- <artifactId>${org.apache.jetspeed.test.jdbc.driver.artifactId}</artifactId>
- <version>${org.apache.jetspeed.test.jdbc.driver.version}</version>
- <scope>test</scope>
- </dependency>
- <!--
- Note: tyrex and junit is normally required only for test, but
- in this case, abstract test cases are included in the
- component build... this should probably be fixed...
- for now, assume that junit will be provided if these
- test classes are used.
- -->
- <dependency>
- <groupId>tyrex</groupId>
- <artifactId>tyrex</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <artifactId>spring-ldap</artifactId>
- <groupId>org.springframework.ldap</groupId>
- <classifier>all</classifier>
- </dependency>
-
- <dependency>
- <artifactId>apacheds-server-unit</artifactId>
- <groupId>org.apache.directory.server</groupId>
- <version>1.5.3</version>
- <scope>test</scope>
- </dependency>
-
- <!-- used by Apache DS -->
- <dependency>
- <artifactId>slf4j-jdk14</artifactId>
- <groupId>org.slf4j</groupId>
- <version>1.4.3</version>
- <scope>test</scope>
- </dependency>
-
-
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/spi/ldap/**.java</exclude>
- <exclude>**/spi/TestDefaultJetspeedSynchronizer.java</exclude>
- <exclude>**/spi/TestPasswordHistoryInterceptor.java</exclude>
- <exclude>**/spi/TestPasswordExpirationAndMaxAuthenticationFailuresInterceptor.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-unpack-maven-plugin</artifactId>
- <version>${pom.version}</version>
- <executions>
- <execution>
- <id>unpack-test-resources</id>
- <goals>
- <goal>unpack</goal>
- </goals>
- <phase>process-test-resources</phase>
- <configuration>
- <skip>${maven.test.skip}</skip>
- <unpack>
- <targetDirectory>${project.build.testOutputDirectory}</targetDirectory>
- <resources>
- <resource>
- <path>assembly</path>
- <include>transaction.xml,security-*.xml,static-bean-references.xml,boot/datasource.xml</include>
- </resource>
- <resource>
- <path>db-ojb</path>
- </resource>
- </resources>
- </unpack>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- <filtering>true</filtering>
- </testResource>
- <testResource>
- <directory>src/test/java</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </testResource>
- </testResources>
- </build>
-
</project>
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/pom.xml?rev=834100&r1=834099&r2=834100&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/pom.xml Mon Nov 9 15:09:46 2009
@@ -18,198 +18,192 @@
$Id$
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
- <prerequisites>
- <maven>2.0.9</maven>
- </prerequisites>
-
- <artifactId>jetspeed-serializer</artifactId>
- <name>Jetspeed-2 Serializer</name>
- <description>Jetspeed-2 Serializer</description>
- <parent>
- <groupId>org.apache.portals.jetspeed-2</groupId>
- <artifactId>components</artifactId>
- <version>2.2.1-SNAPSHOT</version>
- </parent>
- <packaging>jar</packaging>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <!-- Dependencies -->
-
- <dependencies>
-
- <!-- Build Dependencies -->
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-commons</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils-bean-collections</artifactId>
- </exclusion>
- <exclusion>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>javolution</groupId>
- <artifactId>javolution</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ddlutils</groupId>
- <artifactId>ddlutils</artifactId>
- <exclusions>
- <exclusion>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <!--
- The following commented out dependencies are necessary to run the TestSerializer unit test. However,
- since this brings in circular dependency references to the build (breaking the build),
- I have commented out the TestSerializer as well as disabling the test
-
- <dependency>
+ <modelVersion>4.0.0</modelVersion>
+ <prerequisites>
+ <maven>2.0.9</maven>
+ </prerequisites>
+
+ <artifactId>jetspeed-serializer</artifactId>
+ <name>Jetspeed-2 Serializer</name>
+ <description>Jetspeed-2 Serializer</description>
+ <parent>
+ <groupId>org.apache.portals.jetspeed-2</groupId>
+ <artifactId>components</artifactId>
+ <version>2.2.1-SNAPSHOT</version>
+ </parent>
+ <packaging>jar</packaging>
+
+ <!-- Dependencies -->
+
+ <dependencies>
+
+ <!-- Build Dependencies -->
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>jetspeed-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>jetspeed-commons</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils-bean-collections</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>javolution</groupId>
+ <artifactId>javolution</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ddlutils</groupId>
+ <artifactId>ddlutils</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <!--
+ The following commented out dependencies are necessary to run the TestSerializer unit test. However, since this
+ brings in circular dependency references to the build (breaking the build), I have commented out the
+ TestSerializer as well as disabling the test <dependency> <groupId>${pom.groupId}</groupId>
+ <artifactId>jetspeed-registry</artifactId> <scope>test</scope> </dependency> <dependency>
+ <groupId>${pom.groupId}</groupId> <artifactId>jetspeed-capability</artifactId> <scope>test</scope> </dependency>
+
+ <dependency> <groupId>${pom.groupId}</groupId> <artifactId>jetspeed-profiler</artifactId> <scope>test</scope>
+ </dependency>
+ -->
+ <dependency>
+ <groupId>tyrex</groupId>
+ <artifactId>tyrex</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>${org.apache.jetspeed.test.jdbc.driver.groupId}</groupId>
+ <artifactId>${org.apache.jetspeed.test.jdbc.driver.artifactId}</artifactId>
+ <version>${org.apache.jetspeed.test.jdbc.driver.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>jetspeed-cm</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/TestSerializer.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>jetspeed-unpack-maven-plugin</artifactId>
+ <version>${pom.version}</version>
+ <executions>
+ <execution>
+ <id>unpack-test-resources</id>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <phase>process-test-resources</phase>
+ <configuration>
+ <skip>${skipTests}</skip>
+ <unpack>
+ <targetDirectory>${project.build.testOutputDirectory}</targetDirectory>
+ <resources>
+ <resource>
+ <path>assembly</path>
+ <include>*.xml,boot/*.xml</include>
+ <destination>assembly</destination>
+ </resource>
+ <resource>
+ <path>db-ojb</path>
+ </resource>
+ <resource>
+ <path>conf/jetspeed</path>
+ <include>*.properties</include>
+ </resource>
+ <resource>
+ <path>seed</path>
+ <include>*.xml</include>
+ </resource>
+ </resources>
+ </unpack>
+ </configuration>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-registry</artifactId>
- <scope>test</scope>
- </dependency>
+ <artifactId>jetspeed-portal-resources</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <filtering>true</filtering>
+ </testResource>
+ </testResources>
+ </build>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-capability</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-profiler</artifactId>
- <scope>test</scope>
- </dependency>
- -->
- <dependency>
- <groupId>tyrex</groupId>
- <artifactId>tyrex</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>${org.apache.jetspeed.test.jdbc.driver.groupId}</groupId>
- <artifactId>${org.apache.jetspeed.test.jdbc.driver.artifactId}</artifactId>
- <version>${org.apache.jetspeed.test.jdbc.driver.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-cm</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/TestSerializer.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-unpack-maven-plugin</artifactId>
- <version>${pom.version}</version>
- <executions>
- <execution>
- <id>unpack-test-resources</id>
- <goals>
- <goal>unpack</goal>
- </goals>
- <phase>process-test-resources</phase>
- <configuration>
- <skip>${maven.test.skip}</skip>
- <unpack>
- <targetDirectory>${project.build.testOutputDirectory}</targetDirectory>
- <resources>
- <resource>
- <path>assembly</path>
- <include>*.xml,boot/*.xml</include>
- <destination>assembly</destination>
- </resource>
- <resource>
- <path>db-ojb</path>
- </resource>
- <resource>
- <path>conf/jetspeed</path>
- <include>*.properties</include>
- </resource>
- <resource>
- <path>seed</path>
- <include>*.xml</include>
- </resource>
- </resources>
- </unpack>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- <filtering>true</filtering>
- </testResource>
- </testResources>
- </build>
-
</project>
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-sso/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-sso/pom.xml?rev=834100&r1=834099&r2=834100&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-sso/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-sso/pom.xml Mon Nov 9 15:09:46 2009
@@ -18,152 +18,159 @@
$Id$
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
- <prerequisites>
- <maven>2.0.9</maven>
- </prerequisites>
-
- <artifactId>jetspeed-sso</artifactId>
- <name>Jetspeed-2 Single Sign On SSO Components</name>
- <description>Jetspeed-2 Single Sign On SSO Components</description>
- <parent>
- <groupId>org.apache.portals.jetspeed-2</groupId>
- <artifactId>components</artifactId>
- <version>2.2.1-SNAPSHOT</version>
- </parent>
- <packaging>jar</packaging>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <!-- Dependencies -->
+ <modelVersion>4.0.0</modelVersion>
+ <prerequisites>
+ <maven>2.0.9</maven>
+ </prerequisites>
- <dependencies>
+ <artifactId>jetspeed-sso</artifactId>
+ <name>Jetspeed-2 Single Sign On SSO Components</name>
+ <description>Jetspeed-2 Single Sign On SSO Components</description>
+ <parent>
+ <groupId>org.apache.portals.jetspeed-2</groupId>
+ <artifactId>components</artifactId>
+ <version>2.2.1-SNAPSHOT</version>
+ </parent>
+ <packaging>jar</packaging>
- <!-- Build Dependencies -->
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-rdbms</artifactId>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-security</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- </dependency>
- <!-- for spring-core we require JCL -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- </dependency>
-
- <!-- Test Dependencies -->
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-commons</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-file-cache</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${org.apache.jetspeed.test.jdbc.driver.groupId}</groupId>
- <artifactId>${org.apache.jetspeed.test.jdbc.driver.artifactId}</artifactId>
- <version>${org.apache.jetspeed.test.jdbc.driver.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>tyrex</groupId>
- <artifactId>tyrex</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>tyrex</groupId>
- <artifactId>tyrex</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
-
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-cm</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-unpack-maven-plugin</artifactId>
- <version>${pom.version}</version>
- <executions>
- <execution>
- <id>unpack-test-resources</id>
- <goals>
- <goal>unpack</goal>
- </goals>
- <phase>process-test-resources</phase>
- <configuration>
- <skip>${maven.test.skip}</skip>
- <unpack>
- <targetDirectory>${project.build.testOutputDirectory}</targetDirectory>
- <resources>
- <resource>
- <path>assembly</path>
- <include>sso.xml,transaction.xml,security-*.xml,static-bean-references.xml,boot/datasource.xml</include>
- </resource>
- <resource>
- <path>db-ojb</path>
- </resource>
- </resources>
- </unpack>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- <filtering>true</filtering>
- </testResource>
- <testResource>
- <directory>src/test/java</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </testResource>
- </testResources>
- </build>
+ <!-- Dependencies -->
+
+ <dependencies>
+
+ <!-- Build Dependencies -->
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>jetspeed-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>jetspeed-rdbms</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>jetspeed-security</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </dependency>
+ <!-- for spring-core we require JCL -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
+
+ <!-- Test Dependencies -->
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>jetspeed-commons</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>jetspeed-file-cache</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${org.apache.jetspeed.test.jdbc.driver.groupId}</groupId>
+ <artifactId>${org.apache.jetspeed.test.jdbc.driver.artifactId}</artifactId>
+ <version>${org.apache.jetspeed.test.jdbc.driver.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>tyrex</groupId>
+ <artifactId>tyrex</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>tyrex</groupId>
+ <artifactId>tyrex</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>jetspeed-cm</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>jetspeed-unpack-maven-plugin</artifactId>
+ <version>${pom.version}</version>
+ <executions>
+ <execution>
+ <id>unpack-test-resources</id>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <phase>process-test-resources</phase>
+ <configuration>
+ <skip>${skipTests}</skip>
+ <unpack>
+ <targetDirectory>${project.build.testOutputDirectory}</targetDirectory>
+ <resources>
+ <resource>
+ <path>assembly</path>
+ <include>sso.xml,transaction.xml,security-*.xml,static-bean-references.xml,boot/datasource.xml</include>
+ </resource>
+ <resource>
+ <path>db-ojb</path>
+ </resource>
+ </resources>
+ </unpack>
+ </configuration>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>jetspeed-portal-resources</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <filtering>true</filtering>
+ </testResource>
+ <testResource>
+ <directory>src/test/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </testResource>
+ </testResources>
+ </build>
</project>
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/pom.xml?rev=834100&r1=834099&r2=834100&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/pom.xml Mon Nov 9 15:09:46 2009
@@ -18,126 +18,133 @@
$Id$
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
- <prerequisites>
- <maven>2.0.9</maven>
- </prerequisites>
-
- <artifactId>jetspeed-statistics</artifactId>
- <name>Jetspeed-2 Portal Statistics Components</name>
- <description>Jetspeed-2 Portal Statistics Components</description>
- <parent>
- <groupId>org.apache.portals.jetspeed-2</groupId>
- <artifactId>components</artifactId>
- <version>2.2.1-SNAPSHOT</version>
- </parent>
- <packaging>jar</packaging>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <!-- Dependencies -->
+ <modelVersion>4.0.0</modelVersion>
+ <prerequisites>
+ <maven>2.0.9</maven>
+ </prerequisites>
- <dependencies>
+ <artifactId>jetspeed-statistics</artifactId>
+ <name>Jetspeed-2 Portal Statistics Components</name>
+ <description>Jetspeed-2 Portal Statistics Components</description>
+ <parent>
+ <groupId>org.apache.portals.jetspeed-2</groupId>
+ <artifactId>components</artifactId>
+ <version>2.2.1-SNAPSHOT</version>
+ </parent>
+ <packaging>jar</packaging>
- <!-- Build Dependencies -->
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-rdbms</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
-
- <!-- Test Dependencies -->
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-registry</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
+ <!-- Dependencies -->
+
+ <dependencies>
+
+ <!-- Build Dependencies -->
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>jetspeed-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>jetspeed-rdbms</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+
+ <!-- Test Dependencies -->
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>jetspeed-registry</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>jetspeed-security</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>mockrunner</groupId>
+ <artifactId>mockrunner</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${org.apache.jetspeed.test.jdbc.driver.groupId}</groupId>
+ <artifactId>${org.apache.jetspeed.test.jdbc.driver.artifactId}</artifactId>
+ <version>${org.apache.jetspeed.test.jdbc.driver.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>tyrex</groupId>
+ <artifactId>tyrex</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>jetspeed-unpack-maven-plugin</artifactId>
+ <version>${pom.version}</version>
+ <executions>
+ <execution>
+ <id>unpack-test-resources</id>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <phase>process-test-resources</phase>
+ <configuration>
+ <skip>${skipTests}</skip>
+ <unpack>
+ <targetDirectory>${project.build.testOutputDirectory}</targetDirectory>
+ <resources>
+ <resource>
+ <path>assembly</path>
+ <include>statistics.xml,transaction.xml,boot/datasource.xml</include>
+ </resource>
+ <resource>
+ <path>conf/jetspeed</path>
+ <include>jetspeed.properties</include>
+ </resource>
+ <resource>
+ <path>db-ojb</path>
+ </resource>
+ </resources>
+ </unpack>
+ </configuration>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-security</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>mockrunner</groupId>
- <artifactId>mockrunner</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${org.apache.jetspeed.test.jdbc.driver.groupId}</groupId>
- <artifactId>${org.apache.jetspeed.test.jdbc.driver.artifactId}</artifactId>
- <version>${org.apache.jetspeed.test.jdbc.driver.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>tyrex</groupId>
- <artifactId>tyrex</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-unpack-maven-plugin</artifactId>
- <version>${pom.version}</version>
- <executions>
- <execution>
- <id>unpack-test-resources</id>
- <goals>
- <goal>unpack</goal>
- </goals>
- <phase>process-test-resources</phase>
- <configuration>
- <skip>${maven.test.skip}</skip>
- <unpack>
- <targetDirectory>${project.build.testOutputDirectory}</targetDirectory>
- <resources>
- <resource>
- <path>assembly</path>
- <include>statistics.xml,transaction.xml,boot/datasource.xml</include>
- </resource>
- <resource>
- <path>conf/jetspeed</path>
- <include>jetspeed.properties</include>
- </resource>
- <resource>
- <path>db-ojb</path>
- </resource>
- </resources>
- </unpack>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- <filtering>true</filtering>
- </testResource>
- </testResources>
- </build>
+ <artifactId>jetspeed-portal-resources</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <filtering>true</filtering>
+ </testResource>
+ </testResources>
+ </build>
</project>
Modified: portals/jetspeed-2/portal/trunk/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/pom.xml?rev=834100&r1=834099&r2=834100&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/pom.xml Mon Nov 9 15:09:46 2009
@@ -1465,7 +1465,7 @@
<version>${pom.version}</version>
<dependencies>
<dependency>
- <groupId>${groupId}</groupId>
+ <groupId>${pom.groupId}</groupId>
<artifactId>jetspeed-portal-resources</artifactId>
<version>${pom.version}</version>
</dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org