Modified: portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/pom.xml URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/pom.xml?view=diff&rev=512129&r1=512128&r2=512129 ============================================================================== --- portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/pom.xml (original) +++ portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/pom.xml Mon Feb 26 20:11:47 2007 @@ -1,173 +1,173 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Copyright 2006 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:$ ---> -<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.4</maven> - </prerequisites> - - <!-- POM Identification --> - - <artifactId>import</artifactId> - <parent> - <groupId>org.apache.portals.jetspeed-2</groupId> - <artifactId>jetspeed-2</artifactId> - <version>2.1-dev</version> - <relativePath>../../pom.xml</relativePath> - </parent> - <packaging>pom</packaging> - <name>Jetspeed-2 PSML Database Import</name> - <description> - Project used to import the PSML configuration into the production database. - </description> - - <!-- Profiles --> - - <profiles> - - <!-- derby database profile --> - <profile> - <id>jetspeed-db-embedded-derby</id> - <dependencies> - <dependency> - <groupId>org.apache.derby</groupId> - <artifactId>derby</artifactId> - </dependency> - </dependencies> - </profile> - - <!-- hsql database profile --> - <profile> - <id>jetspeed-db-embedded-hsql</id> - <dependencies> - <dependency> - <groupId>hsqldb</groupId> - <artifactId>hsqldb</artifactId> - </dependency> - </dependencies> - </profile> - - </profiles> - - <!-- Build Configuration --> - - <build> - - <!-- Plugin Executions --> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - - <!-- populate production database instance with PSML --> - <execution> - <id>etc-populate-production-psml</id> - <phase>install</phase> - <configuration> - <tasks> - <ant target="populate-db-psml" antfile="build.xml" dir="\${basedir}" inheritRefs="on"> - <property name="org.apache.jetspeed.database.enable" - value="${org.apache.jetspeed.env.deploy.db}"/> - <property name="org.apache.jetspeed.database.skip" - value="${org.apache.jetspeed.env.skip.production}"/> - <property name="org.apache.jetspeed.database.psml" - value="${org.apache.jetspeed.env.deploy.db.psml}"/> - <property name="org.apache.jetspeed.deploy.type" - value="${org.apache.jetspeed.env.deploy.type}"/> - <property name="org.apache.jetspeed.database.default.name" - value="${org.apache.jetspeed.production.database.default.name}"/> - <property name="org.apache.jetspeed.database.url" - value="${org.apache.jetspeed.production.database.url}"/> - <property name="org.apache.jetspeed.database.jdbc.drivers.path" - value="${org.apache.jetspeed.production.jdbc.drivers.path}"/> - <property name="org.apache.jetspeed.database.driver" - value="${org.apache.jetspeed.production.database.driver}"/> - <property name="org.apache.jetspeed.database.user" - value="${org.apache.jetspeed.production.database.user}"/> - <property name="org.apache.jetspeed.database.password" - value="${org.apache.jetspeed.production.database.password}"/> - <property name="org.apache.derby.version" - value="${org.apache.derby.version}"/> - <property name="hsqldb.version" - value="${hsqldb.version}"/> - <property name="org.apache.jetspeed.groupid" - value="${pom.groupId}"/> - <property name="org.apache.jetspeed.version" - value="${pom.version}"/> - <property name="org.apache.pluto.version" - value="${org.apache.pluto.version}"/> - <property name="portlet-api.version" - value="${portlet-api.version}"/> - </ant> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - - </executions> - </plugin> - </plugins> - </build> - - <!-- Dependencies --> - - <dependencies> - - <!-- Provided 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> - - <!-- Test Dependencies --> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>etc</artifactId> - <type>pom</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>jetspeed-page-manager</artifactId> - <scope>test</scope> - </dependency> - - </dependencies> - - <!-- Project Information --> - - <scm> - <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/etc/import</connection> - <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/etc/import</developerConnection> - <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/etc/import/</url> - </scm> - -</project> +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Copyright 2006 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:$ +--> +<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.4</maven> + </prerequisites> + + <!-- POM Identification --> + + <artifactId>import</artifactId> + <parent> + <groupId>org.apache.portals.jetspeed-2</groupId> + <artifactId>jetspeed-2</artifactId> + <version>2.1</version> + <relativePath>../../pom.xml</relativePath> + </parent> + <packaging>pom</packaging> + <name>Jetspeed-2 PSML Database Import</name> + <description> + Project used to import the PSML configuration into the production database. + </description> + + <!-- Profiles --> + + <profiles> + + <!-- derby database profile --> + <profile> + <id>jetspeed-db-embedded-derby</id> + <dependencies> + <dependency> + <groupId>org.apache.derby</groupId> + <artifactId>derby</artifactId> + </dependency> + </dependencies> + </profile> + + <!-- hsql database profile --> + <profile> + <id>jetspeed-db-embedded-hsql</id> + <dependencies> + <dependency> + <groupId>hsqldb</groupId> + <artifactId>hsqldb</artifactId> + </dependency> + </dependencies> + </profile> + + </profiles> + + <!-- Build Configuration --> + + <build> + + <!-- Plugin Executions --> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + + <!-- populate production database instance with PSML --> + <execution> + <id>etc-populate-production-psml</id> + <phase>install</phase> + <configuration> + <tasks> + <ant target="populate-db-psml" antfile="build.xml" dir="\${basedir}" inheritRefs="on"> + <property name="org.apache.jetspeed.database.enable" + value="${org.apache.jetspeed.env.deploy.db}"/> + <property name="org.apache.jetspeed.database.skip" + value="${org.apache.jetspeed.env.skip.production}"/> + <property name="org.apache.jetspeed.database.psml" + value="${org.apache.jetspeed.env.deploy.db.psml}"/> + <property name="org.apache.jetspeed.deploy.type" + value="${org.apache.jetspeed.env.deploy.type}"/> + <property name="org.apache.jetspeed.database.default.name" + value="${org.apache.jetspeed.production.database.default.name}"/> + <property name="org.apache.jetspeed.database.url" + value="${org.apache.jetspeed.production.database.url}"/> + <property name="org.apache.jetspeed.database.jdbc.drivers.path" + value="${org.apache.jetspeed.production.jdbc.drivers.path}"/> + <property name="org.apache.jetspeed.database.driver" + value="${org.apache.jetspeed.production.database.driver}"/> + <property name="org.apache.jetspeed.database.user" + value="${org.apache.jetspeed.production.database.user}"/> + <property name="org.apache.jetspeed.database.password" + value="${org.apache.jetspeed.production.database.password}"/> + <property name="org.apache.derby.version" + value="${org.apache.derby.version}"/> + <property name="hsqldb.version" + value="${hsqldb.version}"/> + <property name="org.apache.jetspeed.groupid" + value="${pom.groupId}"/> + <property name="org.apache.jetspeed.version" + value="${pom.version}"/> + <property name="org.apache.pluto.version" + value="${org.apache.pluto.version}"/> + <property name="portlet-api.version" + value="${portlet-api.version}"/> + </ant> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + + </executions> + </plugin> + </plugins> + </build> + + <!-- Dependencies --> + + <dependencies> + + <!-- Provided 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> + + <!-- Test Dependencies --> + <dependency> + <groupId>${pom.groupId}</groupId> + <artifactId>etc</artifactId> + <type>pom</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>${pom.groupId}</groupId> + <artifactId>jetspeed-page-manager</artifactId> + <scope>test</scope> + </dependency> + + </dependencies> + + <!-- Project Information --> + + <scm> + <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/etc/import</connection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/etc/import</developerConnection> + <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/etc/import/</url> + </scm> + +</project>
Modified: portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/pom.xml URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/pom.xml?view=diff&rev=512129&r1=512128&r2=512129 ============================================================================== --- portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/pom.xml (original) +++ portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/pom.xml Mon Feb 26 20:11:47 2007 @@ -120,9 +120,9 @@ <log4j.version>1.2.8</log4j.version> <org.apache.derby.version>10.1.1.0</org.apache.derby.version> <org.apache.pluto.version>1.0.1</org.apache.pluto.version> - <org.apache.portals.bridges.common.version>1.0.1-dev</org.apache.portals.bridges.common.version> - <org.apache.portals.bridges.velocity.version>1.0</org.apache.portals.bridges.velocity.version> - <org.apache.portals.jetspeed-2.version>2.1-dev</org.apache.portals.jetspeed-2.version> + <org.apache.portals.bridges.common.version>1.0.1</org.apache.portals.bridges.common.version> + <org.apache.portals.bridges.velocity.version>1.0.1</org.apache.portals.bridges.velocity.version> + <org.apache.portals.jetspeed-2.version>2.1</org.apache.portals.jetspeed-2.version> <org.apache.portals.jetspeed-2.groupid>org.apache.portals.jetspeed-2</org.apache.portals.jetspeed-2.groupid> <portlet-api.version>1.0</portlet-api.version> <taglibs-request.version>1.0.1</taglibs-request.version> Modified: portals/jetspeed-2/trunk/maven-archetypes/shared-component/pom.xml URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-archetypes/shared-component/pom.xml?view=diff&rev=512129&r1=512128&r2=512129 ============================================================================== --- portals/jetspeed-2/trunk/maven-archetypes/shared-component/pom.xml (original) +++ portals/jetspeed-2/trunk/maven-archetypes/shared-component/pom.xml Mon Feb 26 20:11:47 2007 @@ -31,7 +31,7 @@ <parent> <groupId>org.apache.portals.jetspeed-2</groupId> <artifactId>maven-archetypes</artifactId> - <version>2.1-dev</version> + <version>2.1</version> <relativePath>../pom.xml</relativePath> </parent> <packaging>jar</packaging> Modified: portals/jetspeed-2/trunk/maven-plugin/plugin.properties URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-plugin/plugin.properties?view=diff&rev=512129&r1=512128&r2=512129 ============================================================================== --- portals/jetspeed-2/trunk/maven-plugin/plugin.properties (original) +++ portals/jetspeed-2/trunk/maven-plugin/plugin.properties Mon Feb 26 20:11:47 2007 @@ -1,3 +1,20 @@ +# 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: project.properties 187000 2004-07-11 03:32:22Z paulsp $ +# +maven.license.licenseFile=${basedir}/../LICENSE.TXT # --------------------------------------------------------------------------- # plugin portal and portal.genapp configuration properties # --------------------------------------------------------------------------- Modified: portals/jetspeed-2/trunk/maven-plugin/project.xml URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-plugin/project.xml?view=diff&rev=512129&r1=512128&r2=512129 ============================================================================== --- portals/jetspeed-2/trunk/maven-plugin/project.xml (original) +++ portals/jetspeed-2/trunk/maven-plugin/project.xml Mon Feb 26 20:11:47 2007 @@ -70,13 +70,13 @@ <dependency> <groupId>org.apache.portals.jetspeed-2</groupId> <artifactId>jetspeed-api</artifactId> - <version>2.1-dev</version> + <version>2.1</version> <type>jar</type> </dependency> <dependency> <groupId>org.apache.portals.jetspeed-2</groupId> <artifactId>jetspeed-deploy-tools</artifactId> - <version>2.1-dev</version> + <version>2.1</version> <type>jar</type> </dependency> <dependency> @@ -116,6 +116,13 @@ <directory>${basedir}</directory> <includes> <include>plugin.jelly</include> + </includes> + </resource> + <resource> + <directory>${basedir}/../</directory> + <targetPath>META-INF</targetPath> + <includes> + <include>LICENSE.TXT</include> </includes> </resource> </resources> Modified: portals/jetspeed-2/trunk/maven.xml URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven.xml?view=diff&rev=512129&r1=512128&r2=512129 ============================================================================== --- portals/jetspeed-2/trunk/maven.xml (original) +++ portals/jetspeed-2/trunk/maven.xml Mon Feb 26 20:11:47 2007 @@ -167,7 +167,7 @@ <goal name="jetspeed2:war:install"> <maven:reactor basedir="${basedir}" includes="applications/**/project.xml,layout-portlets/project.xml" - excludes="applications/project.xml" goals="war:install" banner="Build and Install all Jetspeed 2 wars" + excludes="applications/project.xml,applications/gems/project.xml" goals="war:install" banner="Build and Install all Jetspeed 2 wars" postProcessing="false" ignoreFailures="false" /> </goal> Modified: portals/jetspeed-2/trunk/pom.xml URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/pom.xml?view=diff&rev=512129&r1=512128&r2=512129 ============================================================================== --- portals/jetspeed-2/trunk/pom.xml (original) +++ portals/jetspeed-2/trunk/pom.xml Mon Feb 26 20:11:47 2007 @@ -29,7 +29,7 @@ <groupId>org.apache.portals.jetspeed-2</groupId> <artifactId>jetspeed-2</artifactId> - <version>2.1-dev</version> + <version>2.1</version> <packaging>pom</packaging> <name>Jetspeed-2 Enterprise Portal</name> <description> @@ -181,13 +181,13 @@ <ojb.version>1.0.3</ojb.version> <org.apache.derby.version>10.1.1.0</org.apache.derby.version> <org.apache.pluto.version>1.0.1</org.apache.pluto.version> - <org.apache.portals.bridges.common.version>1.0.1-dev</org.apache.portals.bridges.common.version> - <org.apache.portals.bridges.frameworks.version>1.0.1-dev</org.apache.portals.bridges.frameworks.version> - <org.apache.portals.bridges.jpetstore.version>1.0.1-dev</org.apache.portals.bridges.jpetstore.version> - <org.apache.portals.bridges.jsf-demo.version>1.0.1-dev</org.apache.portals.bridges.jsf-demo.version> - <org.apache.portals.bridges.jsf.version>1.0.1-dev</org.apache.portals.bridges.jsf.version> - <org.apache.portals.bridges.velocity.version>1.0.1-dev</org.apache.portals.bridges.velocity.version> - <org.apache.portals.bridges.portletfilter.version>1.0.1-dev</org.apache.portals.bridges.portletfilter.version> + <org.apache.portals.bridges.common.version>1.0.1</org.apache.portals.bridges.common.version> + <org.apache.portals.bridges.frameworks.version>1.0.1</org.apache.portals.bridges.frameworks.version> + <org.apache.portals.bridges.jpetstore.version>1.0.1</org.apache.portals.bridges.jpetstore.version> + <org.apache.portals.bridges.jsf-demo.version>1.0.1</org.apache.portals.bridges.jsf-demo.version> + <org.apache.portals.bridges.jsf.version>1.0.1</org.apache.portals.bridges.jsf.version> + <org.apache.portals.bridges.velocity.version>1.0.1</org.apache.portals.bridges.velocity.version> + <org.apache.portals.bridges.portletfilter.version>1.0.1</org.apache.portals.bridges.portletfilter.version> <oro.version>2.0.7</oro.version> <portlet-api.version>1.0</portlet-api.version> <regexp.version>1.2</regexp.version> @@ -1240,7 +1240,7 @@ <id>ate</id> <email>[EMAIL PROTECTED]</email> <timezone>+2</timezone> - <organization>iWise B.V.</organization> + <organization>Hippo</organization> <roles> <role>Java Developer</role> </roles> Modified: portals/jetspeed-2/trunk/portal/pom.xml URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/portal/pom.xml?view=diff&rev=512129&r1=512128&r2=512129 ============================================================================== --- portals/jetspeed-2/trunk/portal/pom.xml (original) +++ portals/jetspeed-2/trunk/portal/pom.xml Mon Feb 26 20:11:47 2007 @@ -31,7 +31,7 @@ <parent> <groupId>org.apache.portals.jetspeed-2</groupId> <artifactId>jetspeed-2</artifactId> - <version>2.1-dev</version> + <version>2.1</version> <relativePath>../pom.xml</relativePath> </parent> <packaging>war</packaging> Modified: portals/jetspeed-2/trunk/project.properties URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/project.properties?view=diff&rev=512129&r1=512128&r2=512129 ============================================================================== --- portals/jetspeed-2/trunk/project.properties (original) +++ portals/jetspeed-2/trunk/project.properties Mon Feb 26 20:11:47 2007 @@ -14,22 +14,22 @@ # jetspeed.version is required is {user.home}/build.properties. # Other properties. -jetspeed.version=2.1-dev +jetspeed.version=2.1 pluto.version=1.0.1 portlet.api.version=1.0 servlet.api.version=2.3 myfaces.version=1.1.0 bridges.groupId=org.apache.portals.bridges -portals.bridges.version=1.0.1-dev -portals.bridges.common.version=1.0.1-dev -portals.bridges.frameworks.version=1.0.1-dev -portals.bridges.jsf.version=1.0.1-dev -portals.bridges.perl.version=1.0.1-dev -portals.bridges.php.version=1.0.1-dev -portals.bridges.struts.version=1.2.7-1.0 -portals.bridges.jpetstore.version=1.0.1-dev -portals.bridges.velocity.version=1.0.1-dev -portals.bridges.portletfilter.version=1.0.1-dev +portals.bridges.version=1.0.1 +portals.bridges.common.version=1.0.1 +portals.bridges.frameworks.version=1.0.1 +portals.bridges.jsf.version=1.0.1 +portals.bridges.perl.version=1.0.1 +portals.bridges.php.version=1.0.1 +portals.bridges.struts.version=1.2.7-1.0.1 +portals.bridges.jpetstore.version=1.0.1 +portals.bridges.velocity.version=1.0.1 +portals.bridges.portletfilter.version=1.0.1 commons.logging.version=1.0.3 spring.version=2.0 spring.modules.version=0.6 Modified: portals/jetspeed-2/trunk/project.xml URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/project.xml?view=diff&rev=512129&r1=512128&r2=512129 ============================================================================== --- portals/jetspeed-2/trunk/project.xml (original) +++ portals/jetspeed-2/trunk/project.xml Mon Feb 26 20:11:47 2007 @@ -22,4 +22,17 @@ <groupId>org.apache.portals.jetspeed-2</groupId> <artifactId>jetspeed</artifactId> <currentVersion>${jetspeed.version}</currentVersion> + + <build> + <resources> + <resource> + <directory>${basedir}</directory> + <targetPath>../${pom.artifactId}/META-INF</targetPath> + <includes> + <include>LICENSE.TXT</include> + </includes> + </resource> + </resources> + </build> + </project> Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/conf/jetspeed.properties URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/conf/jetspeed.properties?view=diff&rev=512129&r1=512128&r2=512129 ============================================================================== --- portals/jetspeed-2/trunk/src/webapp/WEB-INF/conf/jetspeed.properties (original) +++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/conf/jetspeed.properties Mon Feb 26 20:11:47 2007 @@ -27,7 +27,7 @@ include=override.properties portal.name = Jetspeed -portal.version = 2.0 +portal.version = 2.1 # By setting this to true, the Engine will create its own # JNDI context. Not needed in deployment. We use Tomcat's JNDI Modified: portals/jetspeed-2/trunk/taglibs/pom.xml URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/taglibs/pom.xml?view=diff&rev=512129&r1=512128&r2=512129 ============================================================================== --- portals/jetspeed-2/trunk/taglibs/pom.xml (original) +++ portals/jetspeed-2/trunk/taglibs/pom.xml Mon Feb 26 20:11:47 2007 @@ -31,7 +31,7 @@ <parent> <groupId>org.apache.portals.jetspeed-2</groupId> <artifactId>jetspeed-2</artifactId> - <version>2.1-dev</version> + <version>2.1</version> <relativePath>../pom.xml</relativePath> </parent> <packaging>pom</packaging> Modified: portals/jetspeed-2/trunk/taglibs/treecontrol/pom.xml URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/taglibs/treecontrol/pom.xml?view=diff&rev=512129&r1=512128&r2=512129 ============================================================================== --- portals/jetspeed-2/trunk/taglibs/treecontrol/pom.xml (original) +++ portals/jetspeed-2/trunk/taglibs/treecontrol/pom.xml Mon Feb 26 20:11:47 2007 @@ -31,7 +31,7 @@ <parent> <groupId>org.apache.portals.jetspeed-2</groupId> <artifactId>jetspeed2-taglibs</artifactId> - <version>2.1-dev</version> + <version>2.1</version> <relativePath>../pom.xml</relativePath> </parent> <packaging>jar</packaging> Modified: portals/jetspeed-2/trunk/tutorial/xdocs/01/genapp.xml URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/tutorial/xdocs/01/genapp.xml?view=diff&rev=512129&r1=512128&r2=512129 ============================================================================== --- portals/jetspeed-2/trunk/tutorial/xdocs/01/genapp.xml (original) +++ portals/jetspeed-2/trunk/tutorial/xdocs/01/genapp.xml Mon Feb 26 20:11:47 2007 @@ -1,61 +1,61 @@ -<?xml version="1.0"?> -<!-- - 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. ---> -<document> - <properties> - <title>Generating a Jetspeed Portal</title> - <subtitle>Using Maven to Generate a Custom Jetspeed Portal</subtitle> - <authors> - <person name="David Sean Taylor" email="[EMAIL PROTECTED]" /> - </authors> - </properties> - <body> - <section name="Generating a Jetspeed Portal"> - <p> - To create a new custom portal named <b>jetexpress</b>, enter the following commands: - </p> - <source> - <![CDATA[ -# Linux -cd /JetspeedTraining/workspace - -# Windows -cd \JetspeedTraining\workspace - -mvn archetype:create -DarchetypeGroupId=org.apache.portals.jetspeed-2 - -DarchetypeArtifactId=portal-archetype - -DarchetypeVersion=2.1-dev - -DgroupId=org.apache.portals.tutorials - -DartifactId=jetexpress - -Dversion=1.0 - ]]> - </source> - <p> - <b>Paste into Command Line:</b> - <input id='genapp' size="80" value="mvn archetype:create -DarchetypeGroupId=org.apache.portals.jetspeed-2 -DarchetypeArtifactId=portal-archetype -DarchetypeVersion=2.1-dev -DgroupId=org.apache.portals.tutorials -DartifactId=jetexpress -Dversion=1.0"/> - </p> - <p> - A directory named <b>jetexpress</b> under <i>/JetspeedTraining/workspace</i> should have been created. - Notice that <b>jetexpress</b> will be the name of your portal, not <b>jetspeed</b>. The idea is that you - can create a customized portal based upon Jetspeed, but with a different name, customized to meet your organization requirements. - </p> - <p> - <a href='first-steps.html'>Previous</a> <a href='build-it.html'>Next</a> - </p> - </section> - </body> -</document> - +<?xml version="1.0"?> +<!-- + 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. +--> +<document> + <properties> + <title>Generating a Jetspeed Portal</title> + <subtitle>Using Maven to Generate a Custom Jetspeed Portal</subtitle> + <authors> + <person name="David Sean Taylor" email="[EMAIL PROTECTED]" /> + </authors> + </properties> + <body> + <section name="Generating a Jetspeed Portal"> + <p> + To create a new custom portal named <b>jetexpress</b>, enter the following commands: + </p> + <source> + <![CDATA[ +# Linux +cd /JetspeedTraining/workspace + +# Windows +cd \JetspeedTraining\workspace + +mvn archetype:create -DarchetypeGroupId=org.apache.portals.jetspeed-2 + -DarchetypeArtifactId=portal-archetype + -DarchetypeVersion=2.1 + -DgroupId=org.apache.portals.tutorials + -DartifactId=jetexpress + -Dversion=1.0 + ]]> + </source> + <p> + <b>Paste into Command Line:</b> + <input id='genapp' size="80" value="mvn archetype:create -DarchetypeGroupId=org.apache.portals.jetspeed-2 -DarchetypeArtifactId=portal-archetype -DarchetypeVersion=2.1 -DgroupId=org.apache.portals.tutorials -DartifactId=jetexpress -Dversion=1.0"/> + </p> + <p> + A directory named <b>jetexpress</b> under <i>/JetspeedTraining/workspace</i> should have been created. + Notice that <b>jetexpress</b> will be the name of your portal, not <b>jetspeed</b>. The idea is that you + can create a customized portal based upon Jetspeed, but with a different name, customized to meet your organization requirements. + </p> + <p> + <a href='first-steps.html'>Previous</a> <a href='build-it.html'>Next</a> + </p> + </section> + </body> +</document> + Modified: portals/jetspeed-2/trunk/tutorial/xdocs/03/portlet-app.xml URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/tutorial/xdocs/03/portlet-app.xml?view=diff&rev=512129&r1=512128&r2=512129 ============================================================================== --- portals/jetspeed-2/trunk/tutorial/xdocs/03/portlet-app.xml (original) +++ portals/jetspeed-2/trunk/tutorial/xdocs/03/portlet-app.xml Mon Feb 26 20:11:47 2007 @@ -1,84 +1,84 @@ -<?xml version="1.0"?> -<!-- - 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. ---> -<document> - <properties> - <title>Generating a Portlet Application</title> - <subtitle>Using Maven to Generate a Portlet Application</subtitle> - <authors> - <person name="David Sean Taylor" email="[EMAIL PROTECTED]" /> - </authors> - </properties> - <body> - <section name="Generating a Portlet Application"> - <p> - Portlet applications should be stored in a separate sub-project of your main portal project. - Our custom build is setup to put one or more portlet application projects under the <i>applications</i> - directory. For this tutorial, we will create one portlet application. The portlet application - will be automatically built and deployed when you run <b>maven -P tomcat,min</b>. - </p> - <p> - To create a new portal application named <b>express-demo</b>, enter the following commands: - </p> - <source> - <![CDATA[ -# Linux -cd /JetspeedTraining/workspace/jetexpress/applications - -# Windows -cd \JetspeedTraining\workspace\jetexpress\applications - -mvn archetype:create -DarchetypeGroupId=org.apache.portals.jetspeed-2 - -DarchetypeArtifactId=application-archetype - -DarchetypeVersion=2.1-dev - -DgroupId=org.apache.portals.tutorials - -DartifactId=express-demo - -Dversion=1.0 - ]]> - </source> - <p> - <b>Paste into Command Line:</b> - <input id='genapp' size="80" value="mvn archetype:create -DarchetypeGroupId=org.apache.portals.jetspeed-2 -DarchetypeArtifactId=application-archetype -DarchetypeVersion=2.1-dev -DgroupId=org.apache.portals.tutorials -DartifactId=express-demo -Dversion=1.0"/> - </p> - <p> - A directory named <b>express-demo</b> under <i>/JetspeedTraining/workspace/applications</i> should have been created. - Notice that <b>express-demo</b> will be the name of your portlet application. - </p> - <p> - Lets have a closer look at what was created. There is a <b>src</b> directory, and underneath it - three subdirectories <b>java, test, webapp</b>. Under the <b>java</b> directory, there is one - sample portlet. Under the <b>test</b> directory, you will find one unit test. Under the <b>webapp</b> - directory, you will find a number of files that are the basic template for any useful portlet application: - </p> - <img src="../images/src-dir.png"/> - <p> - Here you will find the portlet and servlet deployment descriptors: <b>portlet.xml</b> and <b>web.xml</b>. - Review the files in this directory. We are going to copy over some more sample portlets for the tutorial. - Lets let an ant task to do the work for us: - </p> - <source> - <![CDATA[ - ant copy-portlet-resources - ]]> - </source> - - <p> - <a href='../02/deploy-custom.html'>Previous</a> <a href='build-it.html'>Next</a> - </p> - </section> - </body> -</document> - +<?xml version="1.0"?> +<!-- + 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. +--> +<document> + <properties> + <title>Generating a Portlet Application</title> + <subtitle>Using Maven to Generate a Portlet Application</subtitle> + <authors> + <person name="David Sean Taylor" email="[EMAIL PROTECTED]" /> + </authors> + </properties> + <body> + <section name="Generating a Portlet Application"> + <p> + Portlet applications should be stored in a separate sub-project of your main portal project. + Our custom build is setup to put one or more portlet application projects under the <i>applications</i> + directory. For this tutorial, we will create one portlet application. The portlet application + will be automatically built and deployed when you run <b>maven -P tomcat,min</b>. + </p> + <p> + To create a new portal application named <b>express-demo</b>, enter the following commands: + </p> + <source> + <![CDATA[ +# Linux +cd /JetspeedTraining/workspace/jetexpress/applications + +# Windows +cd \JetspeedTraining\workspace\jetexpress\applications + +mvn archetype:create -DarchetypeGroupId=org.apache.portals.jetspeed-2 + -DarchetypeArtifactId=application-archetype + -DarchetypeVersion=2.1 + -DgroupId=org.apache.portals.tutorials + -DartifactId=express-demo + -Dversion=1.0 + ]]> + </source> + <p> + <b>Paste into Command Line:</b> + <input id='genapp' size="80" value="mvn archetype:create -DarchetypeGroupId=org.apache.portals.jetspeed-2 -DarchetypeArtifactId=application-archetype -DarchetypeVersion=2.1 -DgroupId=org.apache.portals.tutorials -DartifactId=express-demo -Dversion=1.0"/> + </p> + <p> + A directory named <b>express-demo</b> under <i>/JetspeedTraining/workspace/applications</i> should have been created. + Notice that <b>express-demo</b> will be the name of your portlet application. + </p> + <p> + Lets have a closer look at what was created. There is a <b>src</b> directory, and underneath it + three subdirectories <b>java, test, webapp</b>. Under the <b>java</b> directory, there is one + sample portlet. Under the <b>test</b> directory, you will find one unit test. Under the <b>webapp</b> + directory, you will find a number of files that are the basic template for any useful portlet application: + </p> + <img src="../images/src-dir.png"/> + <p> + Here you will find the portlet and servlet deployment descriptors: <b>portlet.xml</b> and <b>web.xml</b>. + Review the files in this directory. We are going to copy over some more sample portlets for the tutorial. + Lets let an ant task to do the work for us: + </p> + <source> + <![CDATA[ + ant copy-portlet-resources + ]]> + </source> + + <p> + <a href='../02/deploy-custom.html'>Previous</a> <a href='build-it.html'>Next</a> + </p> + </section> + </body> +</document> + Modified: portals/jetspeed-2/trunk/xdocs/getting-started-binary.xml URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/xdocs/getting-started-binary.xml?view=diff&rev=512129&r1=512128&r2=512129 ============================================================================== --- portals/jetspeed-2/trunk/xdocs/getting-started-binary.xml (original) +++ portals/jetspeed-2/trunk/xdocs/getting-started-binary.xml Mon Feb 26 20:11:47 2007 @@ -304,7 +304,7 @@ install the maven-plugin as follows: <source> <![CDATA[ -maven -DartifactId=maven-jetspeed2-plugin -DgroupId=org.apache.portals.jetspeed-2 -Dversion=2.0 plugin:download]]> +maven -DartifactId=maven-jetspeed2-plugin -DgroupId=org.apache.portals.jetspeed-2 -Dversion=2.1 plugin:download]]> </source> <i> Note: you must set the version to the --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
