Modified: portals/jetspeed-2/trunk/applications/php/project.xml URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/php/project.xml?rev=216237&r1=216236&r2=216237&view=diff ============================================================================== --- portals/jetspeed-2/trunk/applications/php/project.xml (original) +++ portals/jetspeed-2/trunk/applications/php/project.xml Wed Jul 13 13:57:05 2005 @@ -1,173 +1,137 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE project [ - <!ENTITY % locator-entities SYSTEM "file:locator.ent"> %locator-entities; -]> <!-- - Copyright 2004 The Apache Software Foundation - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - +Copyright 2004 The Apache Software Foundation + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - $Id$ + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + + $Id$ --> <project> - <extend>${basedir}/../../project.xml</extend> - <artifactId>php</artifactId> - <groupId>jetspeed2</groupId> - <name>Jetspeed-2 PHP Portlet Application</name> - <description>PHP Portlet</description> - <shortDescription>PHP Portlets</shortDescription> - - <repository> - <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/applications/php</connection> - <developerConnection> - scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/applications/php - </developerConnection> - <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/applications/php/</url> - </repository> - - <dependencies> - <dependency> - <id>portals-bridges:portals-bridges-php</id> - <version> - &portals-bridges-php-version; - </version> - <type>jar</type> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <id>portals-bridges:portals-bridges-common</id> - <version> - &portals-bridges-common-version; - </version> - <type>jar</type> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <id>itgroundwork:phpportlet</id> - <version>1.0</version> - <type>jar</type> - <properties> - <war.bundle.jar>true</war.bundle.jar> - </properties> - </dependency> - <dependency> - <id>portlet-api</id> - <groupId>portlet-api</groupId> - <version>1.0</version> - <properties> - <war.bundle>false</war.bundle> - </properties> - </dependency> - <dependency> - <id>jstl</id> - <version>1.0.6</version> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - - <dependency> - <id>servletapi</id> - <version>2.3</version> - <properties> - <war.bundle>false</war.bundle> - </properties> - </dependency> - - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>2.1</version> - <url>http://jakarta.apache.org/commons/collections.html</url> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <groupId>commons-digester</groupId> - <artifactId>commons-digester</artifactId> - <version>1.5</version> - <url>http://jakarta.apache.org/commons/digester.html</url> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <groupId>commons-fileupload</groupId> - <artifactId>commons-fileupload</artifactId> - <version>1.0</version> - <url>http://jakarta.apache.org/commons/fileupload/</url> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.0</version> - <url>http://jakarta.apache.org/commons/lang.html</url> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <groupId>commons-validator</groupId> - <artifactId>commons-validator</artifactId> - <version>1.1.2</version> - <url>http://jakarta.apache.org/commons/validator/</url> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <id>log4j</id> - <version>1.2.8</version> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.0.3</version> - <url>http://jakarta.apache.org/commons/logging.html</url> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - - </dependencies> - - - <build> - <sourceDirectory>src/java</sourceDirectory> - </build> - - <reports> - <report>maven-jdepend-plugin</report> - <report>maven-pmd-plugin</report> - <report>maven-changelog-plugin</report> - <report>maven-file-activity-plugin</report> - <report>maven-developer-activity-plugin</report> - <report>maven-license-plugin</report> - <report>maven-javadoc-plugin</report> - <report>maven-jxr-plugin</report> - <report>maven-junit-report-plugin</report> - <report>maven-linkcheck-plugin</report> - <report>maven-tasklist-plugin</report> - </reports> + <extend>${basedir}/../../project-info.xml</extend> + <artifactId>php</artifactId> + <groupId>jetspeed2</groupId> + <name>Jetspeed-2 PHP Portlet Application</name> + <description>PHP Portlet</description> + <shortDescription>PHP Portlets</shortDescription> + + <repository> + <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/applications/php</connection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/applications/php</developerConnection> + <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/applications/php/</url> + </repository> + + <dependencies> + <dependency> + <id>portals-bridges:portals-bridges-php</id> + <version>${portals.bridges.php.version}</version> + <type>jar</type> + <properties> + <war.bundle>true</war.bundle> + </properties> + </dependency> + <dependency> + <id>portals-bridges:portals-bridges-common</id> + <version>${portals.bridges.common.version}</version> + <type>jar</type> + <properties> + <war.bundle>true</war.bundle> + </properties> + </dependency> + <dependency> + <id>itgroundwork:phpportlet</id> + <version>1.0</version> + <type>jar</type> + <properties> + <war.bundle.jar>true</war.bundle.jar> + </properties> + </dependency> + <dependency> + <id>portlet-api</id> + <version>1.0</version> + <properties> + <war.bundle>false</war.bundle> + </properties> + </dependency> + <dependency> + <id>jstl</id> + <version>1.0.6</version> + <properties> + <war.bundle>true</war.bundle> + </properties> + </dependency> + + <dependency> + <id>servletapi</id> + <version>2.3</version> + <properties> + <war.bundle>false</war.bundle> + </properties> + </dependency> + + <dependency> + <id>commons-collections</id> + <version>2.1</version> + <url>http://jakarta.apache.org/commons/collections.html</url> + <properties> + <war.bundle>true</war.bundle> + </properties> + </dependency> + <dependency> + <id>commons-digester</id> + <version>1.5</version> + <url>http://jakarta.apache.org/commons/digester.html</url> + <properties> + <war.bundle>true</war.bundle> + </properties> + </dependency> + <dependency> + <id>commons-fileupload</id> + <version>1.0</version> + <url>http://jakarta.apache.org/commons/fileupload/</url> + <properties> + <war.bundle>true</war.bundle> + </properties> + </dependency> + <dependency> + <id>commons-lang</id> + <version>2.0</version> + <url>http://jakarta.apache.org/commons/lang.html</url> + <properties> + <war.bundle>true</war.bundle> + </properties> + </dependency> + <dependency> + <id>commons-validator</id> + <version>1.1.2</version> + <url>http://jakarta.apache.org/commons/validator/</url> + <properties> + <war.bundle>true</war.bundle> + </properties> + </dependency> + <dependency> + <id>log4j</id> + <version>1.2.8</version> + <properties> + <war.bundle>true</war.bundle> + </properties> + </dependency> + <dependency> + <id>commons-logging</id> + <version>1.0.3</version> + <url>http://jakarta.apache.org/commons/logging.html</url> + <properties> + <war.bundle>true</war.bundle> + </properties> + </dependency> + </dependencies> </project>
Modified: portals/jetspeed-2/trunk/applications/project.xml URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/project.xml?rev=216237&r1=216236&r2=216237&view=diff ============================================================================== --- portals/jetspeed-2/trunk/applications/project.xml (original) +++ portals/jetspeed-2/trunk/applications/project.xml Wed Jul 13 13:57:05 2005 @@ -1,5 +1,5 @@ <project> - <extend>${basedir}/../project.xml</extend> + <extend>${basedir}/../project-info.xml</extend> <pomVersion>3</pomVersion> <artifactId>BAD</artifactId> <name>This should not be built</name> Modified: portals/jetspeed-2/trunk/applications/rss/project.xml URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/rss/project.xml?rev=216237&r1=216236&r2=216237&view=diff ============================================================================== --- portals/jetspeed-2/trunk/applications/rss/project.xml (original) +++ portals/jetspeed-2/trunk/applications/rss/project.xml Wed Jul 13 13:57:05 2005 @@ -1,177 +1,143 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE project [ - <!ENTITY % locator-entities SYSTEM "file:locator.ent"> %locator-entities; -]> <!-- - Copyright 2004 The Apache Software Foundation - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - +Copyright 2004 The Apache Software Foundation + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + $Id$ --> <project> - <extend>${basedir}/../../project.xml</extend> - <artifactId>rss</artifactId> + <extend>${basedir}/../../project-info.xml</extend> + <artifactId>rss</artifactId> <groupId>jetspeed2</groupId> - <name>Jetspeed-2 Language Selector Portlet</name> - <description>Jetspeed-2 Language Selector Portlet</description> - <shortDescription>Language Selector Portlet</shortDescription> - <repository> - <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/applications/rss</connection> + <name>Jetspeed-2 Language Selector Portlet</name> + <description>Jetspeed-2 Language Selector Portlet</description> + <shortDescription>Language Selector Portlet</shortDescription> + <repository> + <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/applications/rss</connection> <developerConnection> scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/applications/rss </developerConnection> - <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/applications/rss/</url> - </repository> - <dependencies> - <dependency> - <id>portlet-api</id> - <groupId>portlet-api</groupId> - <version>1.0</version> - <properties> - <war.bundle>false</war.bundle> - </properties> - </dependency> - <dependency> - <id>servletapi</id> - <version>2.3</version> - <properties> - <war.bundle>false</war.bundle> - </properties> - </dependency> - <dependency> - <id>springframework:spring-core</id> - <version>1.1.1</version> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <groupId>jdom</groupId> - <artifactId>jdom</artifactId> - <version>1.0</version> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.0</version> - <type>jar</type> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <groupId>commons-digester</groupId> - <artifactId>commons-digester</artifactId> - <version>1.5</version> - <type>jar</type> - <url>http://jakarta.apache.org/commons/digester.html</url> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - <version>1.6.1</version> - <type>jar</type> - <url>http://jakarta.apache.org/commons/beanutils.html</url> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <groupId>rome</groupId> - <artifactId>rome</artifactId> - <version>0.4</version> + <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/applications/rss/</url> + </repository> + <dependencies> + <dependency> + <id>portlet-api</id> + <version>1.0</version> + <properties> + <war.bundle>false</war.bundle> + </properties> + </dependency> + <dependency> + <id>servletapi</id> + <version>2.3</version> + <properties> + <war.bundle>false</war.bundle> + </properties> + </dependency> + <dependency> + <id>springframework:spring</id> + <version>${spring.version}</version> + <properties> + <war.bundle>true</war.bundle> + </properties> + </dependency> + <dependency> + <id>jdom</id> + <version>1.0</version> + <properties> + <war.bundle>true</war.bundle> + </properties> + </dependency> + <dependency> + <id>commons-collections</id> + <version>3.0</version> + <type>jar</type> + <properties> + <war.bundle>true</war.bundle> + </properties> + </dependency> + <dependency> + <id>commons-digester</id> + <version>1.5</version> + <type>jar</type> + <url>http://jakarta.apache.org/commons/digester.html</url> + <properties> + <war.bundle>true</war.bundle> + </properties> + </dependency> + <dependency> + <id>commons-beanutils</id> + <version>1.6.1</version> + <type>jar</type> + <url>http://jakarta.apache.org/commons/beanutils.html</url> + <properties> + <war.bundle>true</war.bundle> + </properties> + </dependency> + <dependency> + <id>commons-logging</id> + <version>${commons.logging.version}</version> <type>jar</type> <properties> <war.bundle>true</war.bundle> </properties> </dependency> - <dependency> - <id>xml-apis</id> - <version>2.0.2</version> - <properties> - <war.bundle.jar>true</war.bundle.jar> - </properties> - </dependency> - <dependency> - <groupId>portals-bridges</groupId> - <artifactId>portals-bridges-common</artifactId> - <version> - &portals-bridges-common-version; - </version> - <type>jar</type> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <groupId>portals-bridges</groupId> - <artifactId>portals-bridges-velocity</artifactId> - <version> - &portals-bridges-velocity-version; - </version> - <type>jar</type> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <id>velocity</id> - <version>1.4</version> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <id>velocity-tools</id> - <version>1.1</version> - <url>http://jakarta.apache.org/velocity</url> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - </dependencies> - <build> - <sourceDirectory>src/java</sourceDirectory> - <resources> - <resource> - <directory>${basedir}/src/java/</directory> - <includes> - <include>**/*.properties</include> - </includes> - </resource> - </resources> - </build> - <reports> - <report>maven-jdepend-plugin</report> - <!-- - <report>maven-checkstyle-plugin</report> - --> - <report>maven-pmd-plugin</report> - <report>maven-changelog-plugin</report> - <report>maven-file-activity-plugin</report> - <report>maven-developer-activity-plugin</report> - <report>maven-license-plugin</report> - <report>maven-javadoc-plugin</report> - <report>maven-jxr-plugin</report> - <report>maven-junit-report-plugin</report> - <report>maven-linkcheck-plugin</report> - <report>maven-tasklist-plugin</report> - </reports> + <dependency> + <id>rome</id> + <version>0.4</version> + <type>jar</type> + <properties> + <war.bundle>true</war.bundle> + </properties> + </dependency> + <dependency> + <id>xml-apis</id> + <version>2.0.2</version> + <properties> + <war.bundle.jar>true</war.bundle.jar> + </properties> + </dependency> + <dependency> + <id>portals-bridges:portals-bridges-common</id> + <version>${portals.bridges.common.version}</version> + <type>jar</type> + <properties> + <war.bundle>true</war.bundle> + </properties> + </dependency> + <dependency> + <id>portals-bridges:portals-bridges-velocity</id> + <version>${portals.bridges.velocity.version}</version> + <type>jar</type> + <properties> + <war.bundle>true</war.bundle> + </properties> + </dependency> + <dependency> + <id>velocity</id> + <version>1.4</version> + <properties> + <war.bundle>true</war.bundle> + </properties> + </dependency> + <dependency> + <id>velocity-tools</id> + <version>1.1</version> + <url>http://jakarta.apache.org/velocity</url> + <properties> + <war.bundle>true</war.bundle> + </properties> + </dependency> + </dependencies> </project> Modified: portals/jetspeed-2/trunk/applications/security/project.xml URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/security/project.xml?rev=216237&r1=216236&r2=216237&view=diff ============================================================================== --- portals/jetspeed-2/trunk/applications/security/project.xml (original) +++ portals/jetspeed-2/trunk/applications/security/project.xml Wed Jul 13 13:57:05 2005 @@ -1,283 +1,272 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE project [ - <!ENTITY % locator-entities SYSTEM "file:locator.ent"> %locator-entities; -]> <!-- - Copyright 2004 The Apache Software Foundation - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - +Copyright 2004 The Apache Software Foundation + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + $Id$ --> <project> - <extend>${basedir}/../../project.xml</extend> - <artifactId>security</artifactId> - <groupId>jetspeed2</groupId> - - <name>Jetspeed-2 Security Portlet Application</name> - <description>Security Portlets Container</description> - <shortDescription>Security Portlets Container</shortDescription> + <extend>${basedir}/../../project-info.xml</extend> + <artifactId>security</artifactId> + <groupId>jetspeed2</groupId> + + <name>Jetspeed-2 Security Portlet Application</name> + <description>Security Portlets Container</description> + <shortDescription>Security Portlets Container</shortDescription> - <repository> - <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/applications/security</connection> + <repository> + <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/applications/security</connection> <developerConnection> scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/applications/security </developerConnection> - <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/applications/security/</url> - </repository> + <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/applications/security/</url> + </repository> - <dependencies> - <dependency> - <groupId>jetspeed2</groupId> - <artifactId>jetspeed-api</artifactId> - <version> - &jetspeed-version; - </version> - <type>jar</type> - <properties> - <war.bundle>false</war.bundle> - </properties> - </dependency> - <dependency> - <id>portlet-api</id> - <groupId>portlet-api</groupId> - <version>1.0</version> - <properties> - <war.bundle>false</war.bundle> - </properties> - </dependency> - <dependency> - <id>jstl</id> - <version>1.0.6</version> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <id>taglibs:standard</id> - <version>1.0.6</version> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <id>taglibs:request</id> - <version>1.0.1</version> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <id>servletapi</id> - <version>2.3</version> - <properties> - <war.bundle>false</war.bundle> - </properties> - </dependency> - <dependency> - <id>jetspeed-commons</id> - <groupId>jetspeed2</groupId> - <version> - &jetspeed-version; - </version> - <properties> - <war.bundle>false</war.bundle> - </properties> - </dependency> - <!-- warred jars --> - <dependency> - <groupId>antlr</groupId> - <artifactId>antlr</artifactId> - <version>2.7.2</version> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - <version>1.6.1</version> - <url>http://jakarta.apache.org/commons/beanutils.html</url> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>2.1</version> - <url>http://jakarta.apache.org/commons/collections.html</url> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <groupId>commons-digester</groupId> - <artifactId>commons-digester</artifactId> - <version>1.5</version> - <url>http://jakarta.apache.org/commons/digester.html</url> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <groupId>commons-fileupload</groupId> - <artifactId>commons-fileupload</artifactId> - <version>1.0</version> - <url>http://jakarta.apache.org/commons/fileupload/</url> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.0</version> - <url>http://jakarta.apache.org/commons/lang.html</url> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <groupId>commons-validator</groupId> - <artifactId>commons-validator</artifactId> - <version>1.1.3</version> - <url>http://jakarta.apache.org/commons/validator/</url> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <groupId>oro</groupId> - <artifactId>oro</artifactId> - <version>2.0.7</version> - <url>http://jakarta.apache.org/oro/</url> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <id>log4j</id> - <version>1.2.8</version> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - - &myfaces-deps; - - &jsf-bridge-deps; - - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.0.3</version> - <url>http://jakarta.apache.org/commons/logging.html</url> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <id>portals-bridges-common</id> - <groupId>portals-bridges</groupId> - <version> - &portals-bridges-common-version; - </version> - <properties> - <war.bundle>false</war.bundle> - </properties> - </dependency> - <dependency> - <groupId>portals-gems</groupId> - <artifactId>portals-gems</artifactId> - <version> - &jetspeed-version; - </version> - <type>jar</type> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> + <dependencies> + <dependency> + <groupId>jetspeed2</groupId> + <artifactId>jetspeed-api</artifactId> + <version>${jetspeed.version}</version> + <type>jar</type> + <properties> + <war.bundle>false</war.bundle> + </properties> + </dependency> + <dependency> + <id>portlet-api</id> + <groupId>portlet-api</groupId> + <version>1.0</version> + <properties> + <war.bundle>false</war.bundle> + </properties> + </dependency> + <dependency> + <id>jstl</id> + <version>1.0.6</version> + <properties> + <war.bundle>true</war.bundle> + </properties> + </dependency> + <dependency> + <id>taglibs:standard</id> + <version>1.0.6</version> + <properties> + <war.bundle>true</war.bundle> + </properties> + </dependency> + <dependency> + <id>taglibs:request</id> + <version>1.0.1</version> + <properties> + <war.bundle>true</war.bundle> + </properties> + </dependency> + <dependency> + <id>servletapi</id> + <version>2.3</version> + <properties> + <war.bundle>false</war.bundle> + </properties> + </dependency> + <dependency> + <id>jetspeed-commons</id> + <groupId>jetspeed2</groupId> + <version>${jetspeed.version}</version> + <properties> + <war.bundle>false</war.bundle> + </properties> + </dependency> + <!-- warred jars --> + <dependency> + <groupId>antlr</groupId> + <artifactId>antlr</artifactId> + <version>2.7.2</version> + <properties> + <war.bundle>true</war.bundle> + </properties> + </dependency> + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>1.6.1</version> + <url>http://jakarta.apache.org/commons/beanutils.html</url> + <properties> + <war.bundle>true</war.bundle> + </properties> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>2.1</version> + <url>http://jakarta.apache.org/commons/collections.html</url> + <properties> + <war.bundle>true</war.bundle> + </properties> + </dependency> + <dependency> + <groupId>commons-digester</groupId> + <artifactId>commons-digester</artifactId> + <version>1.5</version> + <url>http://jakarta.apache.org/commons/digester.html</url> + <properties> + <war.bundle>true</war.bundle> + </properties> + </dependency> + <dependency> + <groupId>commons-fileupload</groupId> + <artifactId>commons-fileupload</artifactId> + <version>1.0</version> + <url>http://jakarta.apache.org/commons/fileupload/</url> + <properties> + <war.bundle>true</war.bundle> + </properties> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.0</version> + <url>http://jakarta.apache.org/commons/lang.html</url> + <properties> + <war.bundle>true</war.bundle> + </properties> + </dependency> + <dependency> + <groupId>commons-validator</groupId> + <artifactId>commons-validator</artifactId> + <version>1.1.3</version> + <url>http://jakarta.apache.org/commons/validator/</url> + <properties> + <war.bundle>true</war.bundle> + </properties> + </dependency> + <dependency> + <groupId>oro</groupId> + <artifactId>oro</artifactId> + <version>2.0.7</version> + <url>http://jakarta.apache.org/oro/</url> + <properties> + <war.bundle>true</war.bundle> + </properties> + </dependency> + <dependency> + <id>log4j</id> + <version>${log4j.version}</version> + <properties> + <war.bundle>true</war.bundle> + </properties> + </dependency> + + <dependency> + <id>myfaces:myfaces</id> + <version>${myfaces.version}</version> + <properties> + <war.bundle>true</war.bundle> + </properties> + </dependency> + <dependency> + <id>myfaces:myfaces-jsf-api</id> + <version>${myfaces.version}</version> + <properties> + <war.bundle>true</war.bundle> + </properties> + </dependency> + + <dependency> + <id>portals-bridges:portals-bridges-jsf</id> + <version>${portals.bridges.jsf.version}</version> + <properties> + <war.bundle>true</war.bundle> + </properties> + </dependency> + + <dependency> + <id>commons-logging</id> + <version>${commons.logging.version}</version> + <url>http://jakarta.apache.org/commons/logging.html</url> + <properties> + <war.bundle>true</war.bundle> + </properties> + </dependency> + <dependency> + <id>portals-bridges:portals-bridges-common</id> + <version>${portals.bridges.common.version}</version> + <properties> + <war.bundle>false</war.bundle> + </properties> + </dependency> + <dependency> + <id>portals-gems</id> + <version>${jetspeed.version}</version> + <type>jar</type> + <properties> + <war.bundle>true</war.bundle> + </properties> + </dependency> <dependency> - <groupId>portals-bridges</groupId> - <artifactId>portals-bridges-velocity</artifactId> - <version> - &portals-bridges-velocity-version; - </version> + <id>portals-bridges:portals-bridges-velocity</id> + <version>${portals.bridges.velocity.version}</version> <type>jar</type> <properties> <war.bundle>true</war.bundle> </properties> </dependency> - <dependency> - <id>velocity</id> - <version>1.4</version> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <id>velocity-tools</id> - <version>1.1</version> - <url>http://jakarta.apache.org/velocity</url> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - - <dependency> - <groupId>commons-el</groupId> - <artifactId>commons-el</artifactId> - <version>1.0</version> - <url>http://jakarta.apache.org/commons/el/</url> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - - <!-- needed for hack around PLUTO-83 bug in ChangePasswordPortlet - TODO: should be removed again when rc2 is release --> - - &pluto-deps; - - <dependency> - <groupId>jetspeed2</groupId> - <artifactId>jetspeed2-taglib-treecontrol</artifactId> - <version> - &jetspeed-version; - </version> + <dependency> + <id>velocity</id> + <version>1.4</version> + <properties> + <war.bundle>true</war.bundle> + </properties> + </dependency> + <dependency> + <id>velocity-tools</id> + <version>1.1</version> + <url>http://jakarta.apache.org/velocity</url> + <properties> + <war.bundle>true</war.bundle> + </properties> + </dependency> + + <dependency> + <id>commons-el</id> + <version>1.0</version> + <url>http://jakarta.apache.org/commons/el/</url> + <properties> + <war.bundle>true</war.bundle> + </properties> + </dependency> + + <!-- needed for hack around PLUTO-83 bug in ChangePasswordPortlet + TODO: should be removed again when rc2 is release --> + + <!-- Pluto Container --> + <dependency> + <id>pluto</id> + <version>${pluto.version}</version> + <type>jar</type> + <properties> + <war.bundle>false</war.bundle> + </properties> + </dependency> + + <dependency> + <id>jetspeed2:jetspeed2-taglib-treecontrol</id> + <version>${jetspeed.version}</version> <type>jar</type> <properties> <war.bundle>true</war.bundle> </properties> - </dependency> - - </dependencies> - <build> - <sourceDirectory>src/java</sourceDirectory> - <resources> - <resource> - <directory>${basedir}/src/java/</directory> - <includes> - <include>**/*.properties</include> - </includes> - </resource> - </resources> - </build> - - <reports> - - &j2-reports; + </dependency> + </dependencies> - </reports> </project> Modified: portals/jetspeed-2/trunk/applications/struts-demo/project.xml URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/struts-demo/project.xml?rev=216237&r1=216236&r2=216237&view=diff ============================================================================== --- portals/jetspeed-2/trunk/applications/struts-demo/project.xml (original) +++ portals/jetspeed-2/trunk/applications/struts-demo/project.xml Wed Jul 13 13:57:05 2005 @@ -1,208 +1,159 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE project [ - <!ENTITY % locator-entities SYSTEM "file:locator.ent"> %locator-entities; -]> <!-- - Copyright 2004 The Apache Software Foundation - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - +Copyright 2004 The Apache Software Foundation + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + $Id$ --> <project> - <extend>${basedir}/../../project.xml</extend> - <pomVersion>3</pomVersion> - <artifactId>struts-demo</artifactId> - <groupId>jetspeed2</groupId> - - <name>Struts Portlet Demo</name> - - <package>org.apache.struts.webapp.example</package> - <description>Struts Portlet Demo</description> - <shortDescription>Struts Portlet Demo</shortDescription> + <extend>${basedir}/../../project-info.xml</extend> + <pomVersion>3</pomVersion> + <artifactId>struts-demo</artifactId> + <groupId>jetspeed2</groupId> + <name>Struts Portlet Demo</name> + + <package>org.apache.struts.webapp.example</package> + <description>Struts Portlet Demo</description> + <shortDescription>Struts Portlet Demo</shortDescription> - <repository> + <repository> <connection> scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/applications/struts-demo </connection> <developerConnection> scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/applications/struts-demo </developerConnection> - <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/applications/struts-demo/</url> - </repository> + <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/applications/struts-demo/</url> + </repository> - <dependencies> - <dependency> - <id>servletapi</id> - <version>2.3</version> - <properties> - <war.bundle>false</war.bundle> - </properties> - </dependency> - <dependency> - <id>log4j</id> - <version>1.2.8</version> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.0.3</version> - <url>http://jakarta.apache.org/commons/logging.html</url> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <groupId>portlet-api</groupId> - <artifactId>portlet-api</artifactId> - <version>1.0</version> - <properties> - <war.bundle>false</war.bundle> - </properties> - </dependency> - <!-- for unit tests --> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <url>http://www.junit.org</url> - <properties> - <war.bundle>false</war.bundle> - </properties> - </dependency> - <!-- warred jars --> - <dependency> - <groupId>antlr</groupId> - <artifactId>antlr</artifactId> - <version>2.7.2</version> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - <version>1.6.1</version> - <url>http://jakarta.apache.org/commons/beanutils.html</url> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>2.1</version> - <url>http://jakarta.apache.org/commons/collections.html</url> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <groupId>commons-digester</groupId> - <artifactId>commons-digester</artifactId> - <version>1.5</version> - <url>http://jakarta.apache.org/commons/digester.html</url> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <groupId>commons-fileupload</groupId> - <artifactId>commons-fileupload</artifactId> - <version>1.0</version> - <url>http://jakarta.apache.org/commons/fileupload/</url> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.0</version> - <url>http://jakarta.apache.org/commons/lang.html</url> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <groupId>commons-validator</groupId> - <artifactId>commons-validator</artifactId> - <version>1.1.3</version> - <url>http://jakarta.apache.org/commons/validator/</url> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <groupId>oro</groupId> - <artifactId>oro</artifactId> - <version>2.0.7</version> - <url>http://jakarta.apache.org/oro/</url> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <groupId>struts</groupId> - <artifactId>struts</artifactId> - <version>1.2.4</version> - <url>http://jakarta.apache.org/struts/</url> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - <dependency> - <groupId>portals-bridges</groupId> - <artifactId>portals-bridges-struts</artifactId> - <version> - &portals-bridges-struts-version; - </version> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> - </dependencies> - - <build> - <sourceDirectory>src/java</sourceDirectory> - <resources> - <resource> - <directory>${basedir}/src/java</directory> - <excludes> - <exclude>**/*.java</exclude> - </excludes> - </resource> - </resources> - </build> - - <reports> - <report>maven-jdepend-plugin</report> - <!-- - <report>maven-checkstyle-plugin</report> - --> - <report>maven-pmd-plugin</report> - <report>maven-changelog-plugin</report> - <report>maven-file-activity-plugin</report> - <report>maven-developer-activity-plugin</report> - <report>maven-license-plugin</report> - <report>maven-javadoc-plugin</report> - <report>maven-jxr-plugin</report> - <report>maven-junit-report-plugin</report> - <report>maven-jcoverage-plugin</report> - <report>maven-linkcheck-plugin</report> - <report>maven-tasklist-plugin</report> - </reports> + <dependencies> + <dependency> + <id>servletapi</id> + <version>2.3</version> + <properties> + <war.bundle>false</war.bundle> + </properties> + </dependency> + <dependency> + <id>log4j</id> + <version>${log4j.version}</version> + <properties> + <war.bundle>${log4j.include}</war.bundle> + </properties> + </dependency> + <dependency> + <id>commons-logging</id> + <version>${commons.logging.version}</version> + <url>http://jakarta.apache.org/commons/logging.html</url> + <properties> + <war.bundle>${commons.logging.include}</war.bundle> + </properties> + </dependency> + <dependency> + <id>portlet-api</id> + <version>1.0</version> + <properties> + <war.bundle>false</war.bundle> + </properties> + </dependency> + <!-- for unit tests --> + <dependency> + <id>junit</id> + <version>3.8.1</version> + <url>http://www.junit.org</url> + <properties> + <war.bundle>false</war.bundle> + </properties> + </dependency> + <!-- warred jars --> + <dependency> + <id>antlr</id> + <version>2.7.2</version> + <properties> + <war.bundle>true</war.bundle> + </properties> + </dependency> + <dependency> + <id>commons-beanutils</id> + <version>1.6.1</version> + <url>http://jakarta.apache.org/commons/beanutils.html</url> + <properties> + <war.bundle>true</war.bundle> + </properties> + </dependency> + <dependency> + <id>commons-collections</id> + <version>2.1</version> + <url>http://jakarta.apache.org/commons/collections.html</url> + <properties> + <war.bundle>true</war.bundle> + </properties> + </dependency> + <dependency> + <id>commons-digester</id> + <version>1.5</version> + <url>http://jakarta.apache.org/commons/digester.html</url> + <properties> + <war.bundle>true</war.bundle> + </properties> + </dependency> + <dependency> + <id>commons-fileupload</id> + <version>1.0</version> + <url>http://jakarta.apache.org/commons/fileupload/</url> + <properties> + <war.bundle>true</war.bundle> + </properties> + </dependency> + <dependency> + <id>commons-lang</id> + <version>2.0</version> + <url>http://jakarta.apache.org/commons/lang.html</url> + <properties> + <war.bundle>true</war.bundle> + </properties> + </dependency> + <dependency> + <id>commons-validator</id> + <version>1.1.3</version> + <url>http://jakarta.apache.org/commons/validator/</url> + <properties> + <war.bundle>true</war.bundle> + </properties> + </dependency> + <dependency> + <id>oro</id> + <version>2.0.7</version> + <url>http://jakarta.apache.org/oro/</url> + <properties> + <war.bundle>true</war.bundle> + </properties> + </dependency> + <dependency> + <id>struts</id> + <version>1.2.4</version> + <url>http://jakarta.apache.org/struts/</url> + <properties> + <war.bundle>true</war.bundle> + </properties> + </dependency> + <dependency> + <id>portals-bridges:portals-bridges-struts</id> + <version>${portals.bridges.struts.version}</version> + <properties> + <war.bundle>true</war.bundle> + </properties> + </dependency> + </dependencies> </project> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
