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 rw...@apache.org on 2006/03/21 01:47:40 UTC
svn commit: r387361 [1/3] - in /portals/jetspeed-2/trunk: ./ ant-tasks/
ant-tasks/src/ ant-tasks/src/java/ ant-tasks/src/java/org/
ant-tasks/src/java/org/apache/ ant-tasks/src/java/org/apache/jetspeed/
ant-tasks/src/java/org/apache/jetspeed/anttasks/ a...
Author: rwatler
Date: Mon Mar 20 16:47:37 2006
New Revision: 387361
URL: http://svn.apache.org/viewcvs?rev=387361&view=rev
Log:
- correct name of jetspeed-component artifact
- first pass at Maven2 portal archetype to duplicate Maven1 plugin j2:portal-genapp goal
Here is an example archetype:create invocation to create a custom portal instance:
mvn archetype:create -DarchetypeGroupId=org.apache.portals.jetspeed-2 -DarchetypeArtifactId=portal-archetype -DarchetypeVersion=2.1-dev -DgroupId=myportalgroup -DartifactId=myportal -Dversion=1.0
After running this command, a new directory named 'myportal' will be created. As
with J2, there is a sample settings.xml.sample file that needs to be customized
and placed in ~/.m2 to continue. The expanded archetype uses a reduced set of
settings as used by J2, so a new settings.xml file does not need to be created
for the archetype. The same J2 build commands are supported for the most part,
(the 'full' and 'min' profiles do not apply since the archetype is generated as
a 'min' deployment; the creation of a test database is not supported in the
'test' profile):
> mvn # simple build
> mvn -P test # simple build with tests
> mvn -P tomcat # build and deploy to tomcat
> mvn -P tomcat,nodb # build and deploy to tomcat w/o a db update
> mvn -P tomcat,hot # build followed by hot deploy
I have not implemented the companion component and application archetypes yet.
More documentation to follow separately.
Added:
portals/jetspeed-2/trunk/ant-tasks/
portals/jetspeed-2/trunk/ant-tasks/pom.xml (with props)
portals/jetspeed-2/trunk/ant-tasks/src/
portals/jetspeed-2/trunk/ant-tasks/src/java/
portals/jetspeed-2/trunk/ant-tasks/src/java/org/
portals/jetspeed-2/trunk/ant-tasks/src/java/org/apache/
portals/jetspeed-2/trunk/ant-tasks/src/java/org/apache/jetspeed/
portals/jetspeed-2/trunk/ant-tasks/src/java/org/apache/jetspeed/anttasks/
portals/jetspeed-2/trunk/ant-tasks/src/java/org/apache/jetspeed/anttasks/ArchetypeDescriptor.java (with props)
portals/jetspeed-2/trunk/ant-tasks/src/java/org/apache/jetspeed/anttasks/antlib.xml (with props)
portals/jetspeed-2/trunk/maven-archetypes/
portals/jetspeed-2/trunk/maven-archetypes/application/
portals/jetspeed-2/trunk/maven-archetypes/component/
portals/jetspeed-2/trunk/maven-archetypes/pom.xml (with props)
portals/jetspeed-2/trunk/maven-archetypes/portal/
portals/jetspeed-2/trunk/maven-archetypes/portal-resources/
portals/jetspeed-2/trunk/maven-archetypes/portal-resources/build.xml (with props)
portals/jetspeed-2/trunk/maven-archetypes/portal-resources/pom.xml (with props)
portals/jetspeed-2/trunk/maven-archetypes/portal/build.xml (with props)
portals/jetspeed-2/trunk/maven-archetypes/portal/pom.xml (with props)
portals/jetspeed-2/trunk/maven-archetypes/portal/src/
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/META-INF/
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/META-INF/archetype.xml (with props)
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/build.xml (with props)
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/pom.xml (with props)
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/applications/
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/applications/pom.xml (with props)
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/components/
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/components/pom.xml (with props)
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/assembly/
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/assembly/readme.txt (with props)
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/build.xml (with props)
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/decorations/
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/decorations/readme.txt (with props)
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/pages/
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/pages/readme.txt (with props)
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/pom.xml (with props)
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/templates/
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/templates/readme.txt (with props)
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/webapp/
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/webapp/readme.txt (with props)
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/pom.xml (with props)
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/build.xml (with props)
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/pom.xml (with props)
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/src/
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/src/webapp/
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/src/webapp/WEB-INF/
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/src/webapp/WEB-INF/assembly/
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/src/webapp/WEB-INF/assembly/readme.txt (with props)
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/src/webapp/WEB-INF/pages/
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/src/webapp/WEB-INF/pages/readme.txt (with props)
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/src/webapp/WEB-INF/templates/
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/src/webapp/WEB-INF/templates/readme.txt (with props)
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/src/webapp/decorations/
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/src/webapp/decorations/readme.txt (with props)
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/src/webapp/readme.txt (with props)
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/settings.xml.sample
portals/jetspeed-2/trunk/portal/
portals/jetspeed-2/trunk/portal/build.xml (with props)
portals/jetspeed-2/trunk/portal/pom.xml (with props)
Removed:
portals/jetspeed-2/trunk/applications/jetspeed/
Modified:
portals/jetspeed-2/trunk/app-servers/build.xml
portals/jetspeed-2/trunk/applications/pom.xml
portals/jetspeed-2/trunk/components/jetspeed/pom.xml
portals/jetspeed-2/trunk/pom.xml
Added: portals/jetspeed-2/trunk/ant-tasks/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/ant-tasks/pom.xml?rev=387361&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/ant-tasks/pom.xml (added)
+++ portals/jetspeed-2/trunk/ant-tasks/pom.xml Mon Mar 20 16:47:37 2006
@@ -0,0 +1,63 @@
+<?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>
+
+ <!-- POM Identification -->
+
+ <groupId>org.apache.portals.jetspeed-2</groupId>
+ <version>2.1-dev</version>
+ <artifactId>ant-tasks</artifactId>
+ <parent>
+ <groupId>org.apache.portals.jetspeed-2</groupId>
+ <version>2.1-dev</version>
+ <artifactId>jetspeed-2</artifactId>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <packaging>jar</packaging>
+ <name>Jetspeed-2 Ant Tasks</name>
+ <description>
+ Ant Tasks Required for the Jetspeed-2 Product Build.
+ </description>
+
+ <!-- Dependencies -->
+
+ <dependencies>
+
+ <!-- Provided Dependencies -->
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ </dependencies>
+
+ <!-- Project Information -->
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/ant-tasks</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/ant-tasks</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/ant-tasks/</url>
+ </scm>
+
+</project>
Propchange: portals/jetspeed-2/trunk/ant-tasks/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: portals/jetspeed-2/trunk/ant-tasks/src/java/org/apache/jetspeed/anttasks/ArchetypeDescriptor.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/ant-tasks/src/java/org/apache/jetspeed/anttasks/ArchetypeDescriptor.java?rev=387361&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/ant-tasks/src/java/org/apache/jetspeed/anttasks/ArchetypeDescriptor.java (added)
+++ portals/jetspeed-2/trunk/ant-tasks/src/java/org/apache/jetspeed/anttasks/ArchetypeDescriptor.java Mon Mar 20 16:47:37 2006
@@ -0,0 +1,312 @@
+/*
+ * 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.
+ */
+package org.apache.jetspeed.anttasks;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.DirectoryScanner;
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.types.AbstractFileSet;
+import org.apache.tools.ant.types.Reference;
+
+/**
+ * ArchetypeDescriptor
+ *
+ * This Ant task is used to generate a Maven2 Archetype Descriptor file.
+ *
+ * @author <a href="mailto:rwatler@apache.org">Randy Watler</a>
+ * @version $Id: $
+ */
+public class ArchetypeDescriptor extends Task
+{
+ private String header;
+ private String artifactId;
+ private Boolean allowPartial = new Boolean(true);
+ private File baseDir;
+ private File destFile;
+ private Reference sourcesRefId;
+ private Reference resourcesRefId;
+ private Reference testSourcesRefId;
+ private Reference testResourcesRefId;
+ private Reference siteResourcesRefId;
+
+ /**
+ * Set archetype descriptor header text
+ *
+ * @param header archetype header text
+ */
+ public void addText(String header)
+ {
+ this.header = getProject().replaceProperties(header);
+ }
+
+ /**
+ * Set archetype artifact id.
+ *
+ * @param artifactId archetype artifact id
+ */
+ public void setArtifactid(String artifactId)
+ {
+ this.artifactId = artifactId;
+ }
+
+ /**
+ * Set archetype partial rules to support execution in existing projects.
+ *
+ * @param allowPartial archetype allow partial setting
+ */
+ public void setAllowpartial(Boolean allowPartial)
+ {
+ this.allowPartial = allowPartial;
+ }
+
+ /**
+ * Set archetype base directory for all sources/resources.
+ *
+ * @param baseDir archtype source/resource base directory
+ */
+ public void setBasedir(File baseDir)
+ {
+ this.baseDir = baseDir;
+ }
+
+ /**
+ * Set archetype descriptor destination file.
+ *
+ * @param destFile archetype descriptor file to generate
+ */
+ public void setDestfile(File destFile)
+ {
+ this.destFile = destFile;
+ }
+
+ /**
+ * Set archetype sources refid.
+ *
+ * @param sourcesRefId archetype sources
+ */
+ public void setSourcesrefid(Reference sourcesRefId)
+ {
+ this.sourcesRefId = sourcesRefId;
+ }
+
+ /**
+ * Set archetype resources fileset refid.
+ *
+ * @param resourcesRefId archetype resources
+ */
+ public void setResourcesrefid(Reference resourcesRefId)
+ {
+ this.resourcesRefId = resourcesRefId;
+ }
+
+ /**
+ * Set archetype test sources fileset refid.
+ *
+ * @param testSourcesRefId archetype test sources
+ */
+ public void setTestsourcesrefid(Reference testSourcesRefId)
+ {
+ this.testSourcesRefId = testSourcesRefId;
+ }
+
+ /**
+ * Set archetype test resources fileset refid.
+ *
+ * @param testResourcesRefId archetype test resources
+ */
+ public void setTestresourcesrefid(Reference testResourcesRefId)
+ {
+ this.testResourcesRefId = testResourcesRefId;
+ }
+
+ /**
+ * Set archetype site resources fileset refid.
+ *
+ * @param siteResourcesRefId archetype site resources
+ */
+ public void setSiteresourcesrefid(Reference siteResourcesRefId)
+ {
+ this.siteResourcesRefId = siteResourcesRefId;
+ }
+
+ /**
+ * Executes task to generate desciptor file.
+ *
+ * @throws BuildException
+ */
+ public void execute() throws BuildException
+ {
+ // basic validation
+ if ((artifactId == null) || (baseDir == null) || (destFile == null))
+ {
+ throw new BuildException("required artifactid, basedir, or destfile attribute missing", getLocation());
+ }
+
+ // reference sources/resources
+ List sources = archetypeFiles(sourcesRefId, "sourcesrefid");
+ List resources = archetypeFiles(resourcesRefId, "resourcesrefid");
+ List testSources = archetypeFiles(testSourcesRefId, "testsourcesrefid");
+ List testResources = archetypeFiles(testResourcesRefId, "testresourcesrefid");
+ List siteResources = archetypeFiles(siteResourcesRefId, "siteresourcesrefid");
+
+ // write archetype descriptor file
+ PrintWriter writer = null;
+ try
+ {
+ // make sure destination ddirectory exists
+ File destDir = destFile.getParentFile();
+ if (!destDir.exists())
+ {
+ destDir.mkdirs();
+ }
+
+ // write descriptor to destination file
+ writer = new PrintWriter(new OutputStreamWriter(new FileOutputStream(destFile), "UTF-8"));
+ writer.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
+ if (header != null)
+ {
+ writer.println(header);
+ }
+ writer.println("<archetype>");
+ writer.println(" <id>" + artifactId + "</id>");
+ writer.println(" <allowPartial>" + allowPartial + "</allowPartial>");
+ writeFiles(writer, "sources", "source", sources);
+ writeFiles(writer, "resources", "resource", resources);
+ writeFiles(writer, "testSources", "source", testSources);
+ writeFiles(writer, "testResources", "resource", testResources);
+ writeFiles(writer, "siteResources", "resource", siteResources);
+ writer.println("</archetype>");
+ }
+ catch (IOException ioe)
+ {
+ throw new BuildException("unable to write decriptor", ioe, getLocation());
+ }
+ finally
+ {
+ if (writer != null)
+ {
+ writer.close();
+ }
+ }
+
+ // log task success
+ int archetypeSourcesCount = sources.size() + resources.size() + testSources.size() + testResources.size() + siteResources.size();
+ log("generated " + destFile + " including " + archetypeSourcesCount + " source/resource files");
+ }
+
+ /**
+ * Utility to read fileset refid attributes.
+ *
+ * @param refId attribute refid
+ * @param name attribute name
+ * @return list of String file paths
+ * @throws BuildException
+ */
+ private List archetypeFiles(Reference refId, String name) throws BuildException
+ {
+ List archetypeFiles = new ArrayList();
+ if (refId != null)
+ {
+ // access fileset from refid
+ if (!(refId.getReferencedObject(getProject()) instanceof AbstractFileSet))
+ {
+ throw new BuildException(name + " attribute must reference a fileset", getLocation());
+ }
+ AbstractFileSet fileSet = (AbstractFileSet)refId.getReferencedObject(getProject());
+ DirectoryScanner directoryScanner = fileSet.getDirectoryScanner(getProject());
+ String [] files = directoryScanner.getIncludedFiles();
+ if ((files != null) && (files.length > 0))
+ {
+ String basePath = canonicalPath(baseDir);
+ for (int i = 0; (i < files.length); i++)
+ {
+ // convert file relative to fileset to file relative
+ // to archetype base dir
+ String archetypePath = files[i];
+ if (basePath != null)
+ {
+ File file = new File(fileSet.getDir(getProject()), files[i]);
+ String filePath = canonicalPath(file);
+ if ((filePath != null) && filePath.startsWith(basePath))
+ {
+ // path relative to baseDir
+ archetypePath = filePath.substring(basePath.length());
+ if (archetypePath.startsWith("/"))
+ {
+ archetypePath = archetypePath.substring(1);
+ }
+ }
+ }
+ // add archetype files
+ archetypeFiles.add(archetypePath);
+ }
+ }
+ }
+ return archetypeFiles;
+ }
+
+ /**
+ * Utility to get canonical file path
+ *
+ * @param file file to convert to canonical path
+ * @return canonical path
+ */
+ private String canonicalPath(File file)
+ {
+ try
+ {
+ String path = file.getCanonicalPath();
+ return path.replace('\\', '/');
+ }
+ catch (IOException ioe)
+ {
+ return null;
+ }
+ }
+
+ /**
+ * Utility to write archetype descriptor file lists.
+ *
+ * @param writer descriptor writer
+ * @param collectionElementName collection element name
+ * @param elementName file element name
+ * @param files list of String file paths
+ * @throws IOException
+ */
+ private void writeFiles(PrintWriter writer, String collectionElementName, String elementName, List files) throws IOException
+ {
+ // write file list to descriptor
+ if (!files.isEmpty())
+ {
+ writer.println(" <" + collectionElementName + ">");
+ Iterator fileIter = files.iterator();
+ while (fileIter.hasNext())
+ {
+ writer.println(" <" + elementName + ">" + (String)fileIter.next() + "</" + elementName + ">");
+ }
+ writer.println(" </" + collectionElementName + ">");
+ }
+ }
+}
Propchange: portals/jetspeed-2/trunk/ant-tasks/src/java/org/apache/jetspeed/anttasks/ArchetypeDescriptor.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: portals/jetspeed-2/trunk/ant-tasks/src/java/org/apache/jetspeed/anttasks/antlib.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/ant-tasks/src/java/org/apache/jetspeed/anttasks/antlib.xml?rev=387361&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/ant-tasks/src/java/org/apache/jetspeed/anttasks/antlib.xml (added)
+++ portals/jetspeed-2/trunk/ant-tasks/src/java/org/apache/jetspeed/anttasks/antlib.xml Mon Mar 20 16:47:37 2006
@@ -0,0 +1,19 @@
+<?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.
+-->
+<antlib>
+ <typedef name="archetypedescriptor" classname="org.apache.jetspeed.anttasks.ArchetypeDescriptor"/>
+</antlib>
Propchange: portals/jetspeed-2/trunk/ant-tasks/src/java/org/apache/jetspeed/anttasks/antlib.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: portals/jetspeed-2/trunk/app-servers/build.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/app-servers/build.xml?rev=387361&r1=387360&r2=387361&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/app-servers/build.xml (original)
+++ portals/jetspeed-2/trunk/app-servers/build.xml Mon Mar 20 16:47:37 2006
@@ -212,6 +212,7 @@
<fileset refid="jetspeed.dependency.id"/>
<mapper type="regexp" from=".*[/\\]([^/\\]*)-${org.apache.jetspeed.version}.war" to="\1.war"/>
</copy>
+ <mkdir dir="${org.apache.jetspeed.server.home}/webapps/jetspeed"/>
<unjar src="${org.apache.jetspeed.server.home}/webapps/jetspeed.war" dest="${org.apache.jetspeed.server.home}/webapps/jetspeed"/>
<!-- generate and deploy jetspeed application context file -->
Modified: portals/jetspeed-2/trunk/applications/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/pom.xml?rev=387361&r1=387360&r2=387361&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/pom.xml (original)
+++ portals/jetspeed-2/trunk/applications/pom.xml Mon Mar 20 16:47:37 2006
@@ -42,7 +42,6 @@
<!-- Application Modules -->
<modules>
- <module>jetspeed</module>
<module>demo</module>
<module>gems</module>
<module>j2-admin</module>
Modified: portals/jetspeed-2/trunk/components/jetspeed/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/jetspeed/pom.xml?rev=387361&r1=387360&r2=387361&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/jetspeed/pom.xml Mon Mar 20 16:47:37 2006
@@ -26,7 +26,7 @@
<groupId>org.apache.portals.jetspeed-2</groupId>
<version>2.1-dev</version>
- <artifactId>jetspeed-jetspeed</artifactId>
+ <artifactId>jetspeed-components</artifactId>
<parent>
<groupId>org.apache.portals.jetspeed-2</groupId>
<version>2.1-dev</version>
Added: portals/jetspeed-2/trunk/maven-archetypes/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/pom.xml?rev=387361&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/pom.xml (added)
+++ portals/jetspeed-2/trunk/maven-archetypes/pom.xml Mon Mar 20 16:47:37 2006
@@ -0,0 +1,70 @@
+<?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>
+
+ <!-- POM Identification -->
+
+ <groupId>org.apache.portals.jetspeed-2</groupId>
+ <version>2.1-dev</version>
+ <artifactId>maven-archetypes</artifactId>
+ <parent>
+ <groupId>org.apache.portals.jetspeed-2</groupId>
+ <version>2.1-dev</version>
+ <artifactId>jetspeed-2</artifactId>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <packaging>pom</packaging>
+ <name>Jetspeed-2 Maven2 Archetypes</name>
+ <description>
+ Jetspeed-2 Maven2 Archetypes used to generate portal, application, and component instances.
+ </description>
+
+ <!-- Archetype Modules -->
+
+ <modules>
+
+ <!-- Portal Archetype -->
+ <module>portal-resources</module>
+ <module>portal</module>
+
+ </modules>
+
+ <!-- Archetype Build Configuration -->
+
+ <build>
+ <resources>
+ <resource>
+ <directory>src/archetype</directory>
+ </resource>
+ </resources>
+ </build>
+
+ <!-- Project Information -->
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/maven-archetypes</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/maven-archetypes</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/maven-archetypes/</url>
+ </scm>
+
+</project>
Propchange: portals/jetspeed-2/trunk/maven-archetypes/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: portals/jetspeed-2/trunk/maven-archetypes/portal-resources/build.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/portal-resources/build.xml?rev=387361&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/portal-resources/build.xml (added)
+++ portals/jetspeed-2/trunk/maven-archetypes/portal-resources/build.xml Mon Mar 20 16:47:37 2006
@@ -0,0 +1,61 @@
+<?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 name="portal-archetype-resources" default="help">
+
+ <!-- Usage -->
+
+ <target name="help">
+ <echo message="Buildfile for the portal archetype resources maven POM."/>
+ <echo message="Usage: ant [ build ]"/>
+ <echo message="Where:"/>
+ <echo message=" build - build resources for archetype."/>
+ </target>
+
+ <!-- Jetspeed Configuration -->
+
+ <target name="build">
+
+ <!-- Assemble required portal webapp resources -->
+ <delete dir="${basedir}/target/classes"/>
+ <mkdir dir="${basedir}/target/classes"/>
+ <copy todir="${basedir}/target/classes">
+ <fileset dir="${basedir}/../../src/webapp">
+ <exclude name="WEB-INF/pages/**"/>
+ </fileset>
+ </copy>
+ <mkdir dir="${basedir}/target/classes/WEB-INF/pages"/>
+ <copy todir="${basedir}/target/classes/WEB-INF/pages">
+ <fileset dir="${basedir}/../../src/webapp/WEB-INF/pages">
+ <include name="Administrative/**"/>
+ <include name="page.security"/>
+ <include name="my-account.psml"/>
+ </fileset>
+ </copy>
+ <copy file="${basedir}/../../src/webapp/WEB-INF/pages/minimal-default-page.psml"
+ tofile="${basedir}/target/classes/WEB-INF/pages/default-page.psml"/>
+ <replace file="${basedir}/target/classes/WEB-INF/pages/default-page.psml"
+ token=" hidden="true""/>
+ <mkdir dir="${basedir}/target/classes/WEB-INF/classes"/>
+ <copy todir="${basedir}/target/classes/WEB-INF/classes">
+ <fileset dir="${basedir}/../../etc/db-ojb"/>
+ </copy>
+
+ </target>
+
+</project>
Propchange: portals/jetspeed-2/trunk/maven-archetypes/portal-resources/build.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: portals/jetspeed-2/trunk/maven-archetypes/portal-resources/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/portal-resources/pom.xml?rev=387361&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/portal-resources/pom.xml (added)
+++ portals/jetspeed-2/trunk/maven-archetypes/portal-resources/pom.xml Mon Mar 20 16:47:37 2006
@@ -0,0 +1,101 @@
+<?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>
+
+ <!-- POM Identification -->
+
+ <groupId>org.apache.portals.jetspeed-2</groupId>
+ <version>2.1-dev</version>
+ <artifactId>portal-archetype-resources</artifactId>
+ <parent>
+ <groupId>org.apache.portals.jetspeed-2</groupId>
+ <version>2.1-dev</version>
+ <artifactId>maven-archetypes</artifactId>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <packaging>jar</packaging>
+ <name>Jetspeed-2 Maven2 Portal Archetype Resources</name>
+ <description>
+ Jetspeed-2 Maven2 Archetype Resources archive used to generate portal instances.
+ </description>
+
+ <!-- Build Configuration -->
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>portal-archetype-resources</id>
+ <phase>process-resources</phase>
+ <configuration>
+ <tasks>
+ <ant target="build" antfile="build.xml" dir="${basedir}" inheritAll="off"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ <!--
+ Bug: All plugin dependencies must be copied to the first instance
+ of the maven-antrun-plugin run, (e.g. to the root pom), since the
+ first set of deps sticks for the entire maven2 execution cycle.
+ Bug: Plugin dependencies are not propagated from pluginManagement.
+ Bug: Versions must be specified here and not in dependencyManagement.
+
+ Note: All ant dependencies are listed to keep ant-tasks in sync.
+ -->
+ <dependencies>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>${ant.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-launcher</artifactId>
+ <version>${ant.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>ant-tasks</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+
+ <!-- Project Information -->
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/maven-archetypes/portal-resources</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/maven-archetypes/portal-resources</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/maven-archetypes/portal-resources/</url>
+ </scm>
+
+</project>
Propchange: portals/jetspeed-2/trunk/maven-archetypes/portal-resources/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: portals/jetspeed-2/trunk/maven-archetypes/portal/build.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/portal/build.xml?rev=387361&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/portal/build.xml (added)
+++ portals/jetspeed-2/trunk/maven-archetypes/portal/build.xml Mon Mar 20 16:47:37 2006
@@ -0,0 +1,133 @@
+<?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 name="portal-archetype" default="help">
+
+ <!-- Properties -->
+
+ <property name="org.apache.jetspeed.archetype.artifactid" value=""/>
+ <property name="org.apache.jetspeed.archetype.version" value=""/>
+
+ <!-- Usage -->
+
+ <target name="help">
+ <echo message="Buildfile for the portal archetype maven POM."/>
+ <echo message="Usage: ant [ build ]"/>
+ <echo message="Where:"/>
+ <echo message=" build - build resources for archetype."/>
+ <echo message="Configuration:"/>
+ <echo message=" org.apache.jetspeed.archetype.artifactid=${org.apache.jetspeed.archetype.artifactid}"/>
+ <echo message=" org.apache.jetspeed.archetype.version=${org.apache.jetspeed.archetype.version}"/>
+ </target>
+
+ <!-- Additional Task Definitions -->
+
+ <taskdef resource="org/apache/jetspeed/anttasks/antlib.xml"/>
+
+ <!-- Jetspeed Configuration -->
+
+ <target name="build">
+
+ <!--
+ Limitation: The archetype plugin does not know how to skip over
+ binary or velocity template/macro files. Consequently, we have to
+ pull in many resources after the fact using the separate
+ portal-archetype-resources archive. This is currently being addressed
+ by the maven team, but am proceeding with the workaround until a
+ new version of the archetype plugin is developed and released.
+ -->
+ <!-- Assemble required portal webapp resources -->
+ <!--
+ <delete dir="${basedir}/target/classes/archetype-resources/portal/src/webapp"/>
+ <mkdir dir="${basedir}/target/classes/archetype-resources/portal/src/webapp"/>
+ <copy todir="${basedir}/target/classes/archetype-resources/portal/src/webapp">
+ <fileset dir="${basedir}/../../src/webapp">
+ <exclude name="WEB-INF/pages/**"/>
+ </fileset>
+ </copy>
+ <mkdir dir="${basedir}/target/classes/archetype-resources/portal/src/webapp/WEB-INF/pages"/>
+ <copy todir="${basedir}/target/classes/archetype-resources/portal/src/webapp/WEB-INF/pages">
+ <fileset dir="${basedir}/../../src/webapp/WEB-INF/pages">
+ <include name="Administrative/**"/>
+ <include name="page.security"/>
+ <include name="my-account.psml"/>
+ </fileset>
+ </copy>
+ <copy file="${basedir}/../../src/webapp/WEB-INF/pages/minimal-default-page.psml"
+ tofile="${basedir}/target/classes/archetype-resources/portal/src/webapp/WEB-INF/pages/default-page.psml"/>
+ <replace file="${basedir}/target/classes/archetype-resources/portal/src/webapp/WEB-INF/pages/default-page.psml"
+ token=" hidden="true""/>
+ <mkdir dir="${basedir}/target/classes/archetype-resources/portal/src/webapp/WEB-INF/classes"/>
+ <copy todir="${basedir}/target/classes/archetype-resources/portal/src/webapp/WEB-INF/classes">
+ <fileset dir="${basedir}/../../etc/db-ojb"/>
+ </copy>
+ -->
+
+ <!-- Assemble required etc database resources -->
+ <delete dir="${basedir}/target/classes/archetype-resources/etc/schema"/>
+ <mkdir dir="${basedir}/target/classes/archetype-resources/etc/schema"/>
+ <copy todir="${basedir}/target/classes/archetype-resources/etc/schema">
+ <fileset dir="${basedir}/../../etc/schema">
+ <exclude name="**/velocity.log*"/>
+ </fileset>
+ </copy>
+ <delete dir="${basedir}/target/classes/archetype-resources/etc/sql"/>
+ <mkdir dir="${basedir}/target/classes/archetype-resources/etc/sql"/>
+ <copy todir="${basedir}/target/classes/archetype-resources/etc/sql">
+ <fileset dir="${basedir}/../../etc/sql"/>
+ </copy>
+
+ <!-- Assemble required etc server configuration resources -->
+ <delete dir="${basedir}/target/classes/archetype-resources/etc/conf"/>
+ <mkdir dir="${basedir}/target/classes/archetype-resources/etc/conf"/>
+ <copy todir="${basedir}/target/classes/archetype-resources/etc/conf">
+ <fileset dir="${basedir}/../../etc/conf"/>
+ </copy>
+
+ <!-- Set POM default jetspeed-2 version -->
+ <replace file="${basedir}/target/classes/archetype-resources/pom.xml"
+ token="@JETSPEED_2_VERSION@" value="${org.apache.jetspeed.archetype.version}"/>
+
+ <!-- Dynamically build archetype descriptor metadata -->
+ <fileset id="archetype.resources.id" dir="${basedir}/target/classes/archetype-resources/">
+ <exclude name="pom.xml"/>
+ </fileset>
+ <archetypedescriptor destFile="${basedir}/target/classes/META-INF/archetype.xml"
+ baseDir="${basedir}/target/classes/archetype-resources"
+ artifactId="${org.apache.jetspeed.archetype.artifactid}"
+ resourcesrefid="archetype.resources.id">
+<!--
+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.
+-->
+ </archetypedescriptor>
+
+ </target>
+
+</project>
Propchange: portals/jetspeed-2/trunk/maven-archetypes/portal/build.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: portals/jetspeed-2/trunk/maven-archetypes/portal/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/portal/pom.xml?rev=387361&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/portal/pom.xml (added)
+++ portals/jetspeed-2/trunk/maven-archetypes/portal/pom.xml Mon Mar 20 16:47:37 2006
@@ -0,0 +1,106 @@
+<?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>
+
+ <!-- POM Identification -->
+
+ <groupId>org.apache.portals.jetspeed-2</groupId>
+ <version>2.1-dev</version>
+ <artifactId>portal-archetype</artifactId>
+ <parent>
+ <groupId>org.apache.portals.jetspeed-2</groupId>
+ <version>2.1-dev</version>
+ <artifactId>maven-archetypes</artifactId>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <packaging>jar</packaging>
+ <name>Jetspeed-2 Maven2 Portal Archetype</name>
+ <description>
+ Jetspeed-2 Maven2 Archetype used to generate portal instances.
+ </description>
+
+ <!-- Build Configuration -->
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>portal-archetype-resources</id>
+ <phase>process-resources</phase>
+ <configuration>
+ <tasks>
+ <ant target="build" antfile="build.xml" dir="${basedir}" inheritAll="off">
+ <property name="org.apache.jetspeed.archetype.artifactid"
+ value="${pom.artifactId}"/>
+ <property name="org.apache.jetspeed.archetype.version"
+ value="${pom.version}"/>
+ </ant>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ <!--
+ Bug: All plugin dependencies must be copied to the first instance
+ of the maven-antrun-plugin run, (e.g. to the root pom), since the
+ first set of deps sticks for the entire maven2 execution cycle.
+ Bug: Plugin dependencies are not propagated from pluginManagement.
+ Bug: Versions must be specified here and not in dependencyManagement.
+
+ Note: All ant dependencies are listed to keep ant-tasks in sync.
+ -->
+ <dependencies>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>${ant.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-launcher</artifactId>
+ <version>${ant.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>ant-tasks</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+
+ <!-- Project Information -->
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/maven-archetypes/portal</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/maven-archetypes/portal</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/maven-archetypes/portal/</url>
+ </scm>
+
+</project>
Propchange: portals/jetspeed-2/trunk/maven-archetypes/portal/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/META-INF/archetype.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/META-INF/archetype.xml?rev=387361&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/META-INF/archetype.xml (added)
+++ portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/META-INF/archetype.xml Mon Mar 20 16:47:37 2006
@@ -0,0 +1,28 @@
+<?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.
+-->
+
+<archetype>
+ <id>portal-archetype</id>
+ <allowPartial>true</allowPartial>
+
+ <!--
+ Note: this file should be replaced by a dynamically generated
+ version using the Jetspeed-2 ArchetypeDescriptor Ant task.
+ -->
+
+</archetype>
Propchange: portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/META-INF/archetype.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/build.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/build.xml?rev=387361&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/build.xml (added)
+++ portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/build.xml Mon Mar 20 16:47:37 2006
@@ -0,0 +1,395 @@
+<?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 name="app-sources" default="help">
+
+ <!-- Properties -->
+
+ <property name="org.apache.jetspeed.deploy.enable" value="true"/>
+ <property name="org.apache.jetspeed.deploy.skip" value="false"/>
+ <property name="org.apache.jetspeed.deploy.target" value="none"/>
+ <property name="org.apache.jetspeed.server.home" value=""/>
+ <property name="org.apache.jetspeed.catalina.version.major" value=""/>
+ <property name="org.apache.jetspeed.production.database.default.name" value=""/>
+ <property name="org.apache.jetspeed.production.database.url" value=""/>
+ <property name="org.apache.jetspeed.production.database.jdbc.drivers.path" value=""/>
+ <property name="org.apache.jetspeed.production.database.driver" value=""/>
+ <property name="org.apache.jetspeed.production.database.user" value=""/>
+ <property name="org.apache.jetspeed.production.database.password" value=""/>
+ <property name="org.apache.jetspeed.groupid" value=""/>
+ <property name="org.apache.jetspeed.version" value=""/>
+ <property name="org.apache.portals.bridges.version" value=""/>
+ <property name="org.apache.pluto.version" value=""/>
+ <property name="portlet-api.version" value=""/>
+ <property name="org.apache.derby.version" value=""/>
+ <property name="hsqldb.version" value=""/>
+ <property name="org.apache.jetspeed.deploy.groupid" value=""/>
+ <property name="org.apache.jetspeed.deploy.artifactid" value=""/>
+ <property name="org.apache.jetspeed.deploy.version" value=""/>
+
+ <!-- Usage -->
+
+ <target name="help">
+ <echo message="Buildfile for the app-servers maven POM."/>
+ <echo message="Usage: ant [ deploy ]"/>
+ <echo message="Where:"/>
+ <echo message=" deploy - deploy to the target app server."/>
+ <echo message=" hot-deploy - hot deploy content and applications to the target app server."/>
+ <echo message=" hot-deploy-jar - hot deploy component jar to the target app server."/>
+ <echo message=" hot-deploy-war - hot deploy application war to the target app server."/>
+ <echo message="Configuration:"/>
+ <echo message=" org.apache.jetspeed.deploy.enable=${org.apache.jetspeed.deploy.enable}"/>
+ <echo message=" org.apache.jetspeed.deploy.skip=${org.apache.jetspeed.deploy.skip}"/>
+ <echo message=" org.apache.jetspeed.deploy.target=${org.apache.jetspeed.deploy.target}"/>
+ <echo message=" org.apache.jetspeed.server.home=${org.apache.jetspeed.server.home}"/>
+ <echo message=" org.apache.jetspeed.catalina.version.major=${org.apache.jetspeed.catalina.version.major}"/>
+ <echo message=" org.apache.jetspeed.production.database.default.name=${org.apache.jetspeed.production.database.default.name}"/>
+ <echo message=" org.apache.jetspeed.production.database.url=${org.apache.jetspeed.production.database.url}"/>
+ <echo message=" org.apache.jetspeed.production.database.jdbc.drivers.path=${org.apache.jetspeed.production.database.jdbc.drivers.path}"/>
+ <echo message=" org.apache.jetspeed.production.database.driver=${org.apache.jetspeed.production.database.driver}"/>
+ <echo message=" org.apache.jetspeed.production.database.user=${org.apache.jetspeed.production.database.user}"/>
+ <echo message=" org.apache.jetspeed.production.database.password=${org.apache.jetspeed.production.database.password}"/>
+ <echo message=" org.apache.jetspeed.groupid=${org.apache.jetspeed.groupid}"/>
+ <echo message=" org.apache.jetspeed.version=${org.apache.jetspeed.version}"/>
+ <echo message=" org.apache.portals.bridges.version=${org.apache.portals.bridges.version}"/>
+ <echo message=" org.apache.pluto.version=${org.apache.pluto.version}"/>
+ <echo message=" portlet-api.version=${portlet-api.version}"/>
+ <echo message=" org.apache.derby.version=${org.apache.derby.version}"/>
+ <echo message=" hsqldb.version=${hsqldb.version}"/>
+ <echo message=" org.apache.jetspeed.deploy.groupid=${org.apache.jetspeed.deploy.groupid}"/>
+ <echo message=" org.apache.jetspeed.deploy.artifactid=${org.apache.jetspeed.deploy.artifactid}"/>
+ <echo message=" org.apache.jetspeed.deploy.version=${org.apache.jetspeed.deploy.version}"/>
+ </target>
+
+ <!-- Deployment Classification -->
+
+ <target name="deploy" depends="test-deploy-target, test-deploy-skip" unless="org.apache.jetspeed.skip">
+
+ <!-- invoke deployment targets -->
+ <antcall target="unsupported-deploy"/>
+ <antcall target="tomcat-deploy"/>
+
+ </target>
+
+ <target name="hot-deploy" depends="test-deploy-target, test-deploy-skip" unless="org.apache.jetspeed.skip">
+
+ <!-- invoke deployment targets -->
+ <antcall target="unsupported-deploy"/>
+ <antcall target="tomcat-hot-deploy"/>
+
+ </target>
+
+ <target name="hot-deploy-jar" depends="test-deploy-target, test-deploy-skip" unless="org.apache.jetspeed.skip">
+
+ <!-- invoke deployment targets -->
+ <antcall target="unsupported-deploy"/>
+ <antcall target="tomcat-hot-deploy-jar"/>
+
+ </target>
+
+ <target name="hot-deploy-war" depends="test-deploy-target, test-deploy-skip" unless="org.apache.jetspeed.skip">
+
+ <!-- invoke deployment targets -->
+ <antcall target="unsupported-deploy"/>
+ <antcall target="tomcat-hot-deploy-war"/>
+
+ </target>
+
+ <target name="test-deploy-target">
+ <condition property="org.apache.jetspeed.tomcat">
+ <equals arg1="${org.apache.jetspeed.deploy.target}" arg2="tomcat"/>
+ </condition>
+ <condition property="org.apache.jetspeed.unsupported">
+ <not>
+ <or>
+ <equals arg1="${org.apache.jetspeed.deploy.target}" arg2="none"/>
+ <equals arg1="${org.apache.jetspeed.deploy.target}" arg2="tomcat"/>
+ </or>
+ </not>
+ </condition>
+ </target>
+
+ <target name="test-deploy-skip">
+ <condition property="org.apache.jetspeed.skip">
+ <or>
+ <equals arg1="${org.apache.jetspeed.deploy.skip}" arg2="true"/>
+ <not>
+ <equals arg1="${org.apache.jetspeed.deploy.enable}" arg2="true"/>
+ </not>
+ </or>
+ </condition>
+ </target>
+
+ <target name="unsupported-deploy" if="org.apache.jetspeed.unsupported">
+ <fail message="Unsupported deployment target: ${org.apache.jetspeed.deploy.target}."/>
+ </target>
+
+ <!-- Additional Task Definitions -->
+
+ <taskdef resource="org/apache/maven/artifact/ant/antlib.xml"/>
+
+ <!-- Tomcat Deployment -->
+
+ <target name="tomcat-deploy" depends="tomcat-5-5" if="org.apache.jetspeed.tomcat">
+
+ <!-- deploy provided libraries in shared/lib -->
+ <delete>
+ <fileset dir="${org.apache.jetspeed.server.home}/shared/lib">
+ <include name="pluto-*.jar"/>
+ <include name="portals-bridges-common-*.jar"/>
+ <include name="jetspeed-commons-*.jar"/>
+ <include name="jetspeed-api-*.jar"/>
+ <include name="portlet-api-*.jar"/>
+ </fileset>
+ </delete>
+ <dependencies filesetId="shared.lib.dependencies.id" useScope="runtime">
+ <dependency groupId="org.apache.pluto"
+ artifactId="pluto"
+ version="${org.apache.pluto.version}"/>
+ <dependency groupId="org.apache.portals.bridges"
+ artifactId="portals-bridges-common"
+ version="${org.apache.portals.bridges.version}"/>
+ <dependency groupId="${org.apache.jetspeed.groupid}"
+ artifactId="jetspeed-commons"
+ version="${org.apache.jetspeed.version}"/>
+ <dependency groupId="${org.apache.jetspeed.groupid}"
+ artifactId="jetspeed-api"
+ version="${org.apache.jetspeed.version}"/>
+ <dependency groupId="portlet-api"
+ artifactId="portlet-api"
+ version="${portlet-api.version}"/>
+ </dependencies>
+ <copy todir="${org.apache.jetspeed.server.home}/shared/lib" flatten="on">
+ <fileset refid="shared.lib.dependencies.id"/>
+ </copy>
+
+ <!-- deploy embedded database in shared/lib -->
+ <antcall target="tomcat-embedded-database"/>
+
+ <!-- deploy portal application -->
+ <delete dir="${org.apache.jetspeed.server.home}/webapps/${artifactId}"/>
+ <delete>
+ <fileset dir="${org.apache.jetspeed.server.home}/webapps">
+ <include name="${artifactId}.war"/>
+ </fileset>
+ </delete>
+ <dependencies filesetId="portal.dependency.id" useScope="runtime">
+ <dependency groupId="${groupId}"
+ artifactId="${artifactId}-portal"
+ version="${version}"
+ type="war"/>
+ </dependencies>
+ <copy todir="${org.apache.jetspeed.server.home}/webapps">
+ <fileset refid="portal.dependency.id"/>
+ <mapper type="regexp" from=".*[/\\][^/\\]*${artifactId}-portal-${version}.war" to="${artifactId}.war"/>
+ </copy>
+ <mkdir dir="${org.apache.jetspeed.server.home}/webapps/${artifactId}"/>
+ <unjar src="${org.apache.jetspeed.server.home}/webapps/${artifactId}.war" dest="${org.apache.jetspeed.server.home}/webapps/${artifactId}"/>
+
+ <!-- generate and deploy portal application context file -->
+ <delete file="${org.apache.jetspeed.server.home}/conf/Catalina/localhost/${artifactId}.xml"/>
+ <copy todir="${org.apache.jetspeed.server.home}/conf/Catalina/localhost">
+ <fileset dir="${basedir}/../etc/conf/tomcat">
+ <include name="jetspeed-tomcat-5.xml" unless="org.apache.jetspeed.tomcat.5.5"/>
+ <include name="jetspeed-tomcat-5.5.xml" if="org.apache.jetspeed.tomcat.5.5"/>
+ </fileset>
+ <filterset begintoken="@" endtoken="@">
+ <filter token="CONTEXT" value="jetspeed"/>
+ <filter token="USERNAME" value="${org.apache.jetspeed.production.database.user}"/>
+ <filter token="PASSWORD" value="${org.apache.jetspeed.production.database.password}"/>
+ <filter token="DRIVER" value="${org.apache.jetspeed.production.database.driver}"/>
+ <filter token="URL" value="${org.apache.jetspeed.production.database.url}"/>
+ </filterset>
+ <mapper type="merge" to="${artifactId}.xml"/>
+ </copy>
+
+ <!-- deploy portlet and layout applications -->
+ <antcall target="tomcat-deploy-apps"/>
+
+ </target>
+
+ <target name="tomcat-5-5">
+ <condition property="org.apache.jetspeed.tomcat.5.5">
+ <equals arg1="${org.apache.jetspeed.catalina.version.major}" arg2="5.5"/>
+ </condition>
+ </target>
+
+ <target name="tomcat-embedded-database" depends="test-embedded-database, tomcat-embedded-database-derby, tomcat-embedded-database-hsql"/>
+
+ <target name="tomcat-embedded-database-derby" if="org.apache.jetspeed.production.database.is.derby.embedded">
+ <!-- Deploy embedded derby database in shared/lib -->
+ <delete>
+ <fileset dir="${org.apache.jetspeed.server.home}/shared/lib">
+ <include name="derby-*.jar"/>
+ </fileset>
+ </delete>
+ <dependencies filesetId="derby.embedded.db.dependencies.id" useScope="runtime">
+ <dependency groupId="org.apache.derby"
+ artifactId="derby"
+ version="${org.apache.derby.version}"/>
+ </dependencies>
+ <copy todir="${org.apache.jetspeed.server.home}/shared/lib" flatten="on">
+ <fileset refid="derby.embedded.db.dependencies.id"/>
+ </copy>
+ </target>
+
+ <target name="tomcat-embedded-database-hsql" if="org.apache.jetspeed.production.database.is.hsql.embedded">
+ <!-- Deploy embedded hsql database in shared/lib -->
+ <delete>
+ <fileset dir="${org.apache.jetspeed.server.home}/shared/lib">
+ <include name="hsqldb-*.jar"/>
+ </fileset>
+ </delete>
+ <dependencies filesetId="hsql.embedded.db.dependencies.id" useScope="runtime">
+ <dependency groupId="hsqldb"
+ artifactId="hsqldb"
+ version="${hsqldb.version}"/>
+ </dependencies>
+ <copy todir="${org.apache.jetspeed.server.home}/shared/lib" flatten="on">
+ <fileset refid="hsql.embedded.db.dependencies.id"/>
+ </copy>
+ </target>
+
+ <target name="tomcat-deploy-apps">
+ <!-- deploy portlet and layout applications -->
+ <delete dir="${org.apache.jetspeed.server.home}/webapps/j2-admin"/>
+ <delete>
+ <fileset dir="${org.apache.jetspeed.server.home}/webapps">
+ <include name="j2-admin.war"/>
+ </fileset>
+ </delete>
+ <delete>
+ <fileset dir="${org.apache.jetspeed.server.home}/conf/Catalina/localhost">
+ <include name="j2-admin.xml"/>
+ </fileset>
+ </delete>
+ <antcall target="tomcat-hot-deploy-war">
+ <param name="org.apache.jetspeed.deploy.groupid" value="${org.apache.jetspeed.groupid}"/>
+ <param name="org.apache.jetspeed.deploy.artifactid" value="jetspeed-layouts"/>
+ <param name="org.apache.jetspeed.deploy.version" value="${org.apache.jetspeed.version}"/>
+ </antcall>
+ <antcall target="tomcat-hot-deploy-war">
+ <param name="org.apache.jetspeed.deploy.groupid" value="${org.apache.jetspeed.groupid}"/>
+ <param name="org.apache.jetspeed.deploy.artifactid" value="j2-admin"/>
+ <param name="org.apache.jetspeed.deploy.version" value="${org.apache.jetspeed.version}"/>
+ </antcall>
+ <antcall target="tomcat-hot-deploy-apps"/>
+ </target>
+
+ <target name="tomcat-hot-deploy" if="org.apache.jetspeed.tomcat">
+
+ <!-- hot deploy content -->
+ <copy todir="${org.apache.jetspeed.server.home}/webapps/${artifactId}">
+ <fileset dir="${basedir}/../portal/src/webapp">
+ <exclude name="WEB-INF/**"/>
+ <exclude name="decorations/**"/>
+ <exclude name="readme.txt"/>
+ </fileset>
+ <fileset dir="${basedir}/../etc/webapp">
+ <exclude name="WEB-INF/**"/>
+ <exclude name="decorations/**"/>
+ <exclude name="readme.txt"/>
+ </fileset>
+ </copy>
+
+ <!-- hot deploy templates content -->
+ <copy todir="${org.apache.jetspeed.server.home}/webapps/${artifactId}/WEB-INF/templates">
+ <fileset dir="${basedir}/../portal/src/webapp/WEB-INF/templates">
+ <exclude name="readme.txt"/>
+ </fileset>
+ <fileset dir="${basedir}/../etc/templates">
+ <exclude name="readme.txt"/>
+ </fileset>
+ </copy>
+
+ <!-- hot deploy portlet and layout applications -->
+ <antcall target="tomcat-hot-deploy-apps"/>
+
+ <!-- hot deploy pages content -->
+ <copy todir="${org.apache.jetspeed.server.home}/webapps/${artifactId}/WEB-INF/pages">
+ <fileset dir="${basedir}/../portal/src/webapp/WEB-INF/pages">
+ <exclude name="readme.txt"/>
+ </fileset>
+ <fileset dir="${basedir}/../etc/pages">
+ <exclude name="readme.txt"/>
+ </fileset>
+ </copy>
+
+ <!-- hot deploy decorations content -->
+ <copy todir="${org.apache.jetspeed.server.home}/webapps/${artifactId}/decorations">
+ <fileset dir="${basedir}/../portal/src/webapp/decorations">
+ <exclude name="readme.txt"/>
+ </fileset>
+ <fileset dir="${basedir}/../etc/decorations">
+ <exclude name="readme.txt"/>
+ </fileset>
+ </copy>
+
+ </target>
+
+ <target name="tomcat-hot-deploy-apps">
+ <!-- hot deploy portlet and layout applications -->
+ </target>
+
+ <target name="tomcat-hot-deploy-jar">
+ <!-- hot deploy component -->
+ <dependencies filesetId="component.dependencies.id" useScope="runtime">
+ <dependency groupId="${org.apache.jetspeed.deploy.groupid}"
+ artifactId="${org.apache.jetspeed.deploy.artifactid}"
+ version="${org.apache.jetspeed.deploy.version}"/>
+ </dependencies>
+ <!-- copy only the artifact and ignore dependencies using mapper -->
+ <copy todir="${org.apache.jetspeed.server.home}/webapps/${artifactId}/WEB-INF/lib">
+ <fileset refid="component.dependencies.id"/>
+ <mapper type="regexp" from=".*[/\\]([^/\\]*${org.apache.jetspeed.deploy.artifactid})-${org.apache.jetspeed.deploy.version}.jar" to="\1.jar"/>
+ </copy>
+ </target>
+
+ <target name="tomcat-hot-deploy-war">
+ <!-- hot deploy portlet or layout application -->
+ <dependencies filesetId="portletapp.dependencies.id" useScope="runtime">
+ <dependency groupId="${org.apache.jetspeed.deploy.groupid}"
+ artifactId="${org.apache.jetspeed.deploy.artifactid}"
+ version="${org.apache.jetspeed.deploy.version}"
+ type="war"/>
+ </dependencies>
+ <!-- copy only the artifact and ignore dependencies using mapper -->
+ <copy todir="${org.apache.jetspeed.server.home}/webapps/${artifactId}/WEB-INF/deploy">
+ <fileset refid="portletapp.dependencies.id"/>
+ <mapper type="regexp" from=".*[/\\]([^/\\]*${org.apache.jetspeed.deploy.artifactid})-${org.apache.jetspeed.deploy.version}.war" to="\1.war"/>
+ </copy>
+ </target>
+
+ <!-- Utility Targets -->
+
+ <target name="test-embedded-database">
+ <condition property="org.apache.jetspeed.production.database.is.derby.embedded">
+ <and>
+ <equals arg1="${org.apache.jetspeed.production.database.default.name}" arg2="derby"/>
+ <equals arg1="${org.apache.jetspeed.production.database.jdbc.drivers.path}" arg2=""/>
+ </and>
+ </condition>
+ <condition property="org.apache.jetspeed.production.database.is.hsql.embedded">
+ <and>
+ <equals arg1="${org.apache.jetspeed.production.database.default.name}" arg2="hsql"/>
+ <equals arg1="${org.apache.jetspeed.production.database.jdbc.drivers.path}" arg2=""/>
+ </and>
+ </condition>
+ </target>
+
+</project>
Propchange: portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/build.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/pom.xml?rev=387361&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/pom.xml (added)
+++ portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/pom.xml Mon Mar 20 16:47:37 2006
@@ -0,0 +1,203 @@
+<?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>
+
+ <!-- POM Identification -->
+
+ <groupId>${groupId}</groupId>
+ <version>${version}</version>
+ <artifactId>${artifactId}-app-servers</artifactId>
+ <parent>
+ <groupId>${groupId}</groupId>
+ <version>${version}</version>
+ <artifactId>${artifactId}</artifactId>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <packaging>pom</packaging>
+ <name>Jetspeed-2 Portal Application Server Deployment</name>
+
+ <!-- Build Configuration -->
+
+ <build>
+
+ <!-- Plugin Executions -->
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+
+ <!-- deploy to application server -->
+ <execution>
+ <id>app-servers-install</id>
+ <phase>install</phase>
+ <configuration>
+ <tasks>
+
+ <!-- normal deployment to app server -->
+ <ant target="deploy" antfile="build.xml" dir="${basedir}" inheritAll="off">
+ <property name="org.apache.jetspeed.deploy.skip"
+ value="${org.apache.jetspeed.env.hotdeploy}"/>
+ <property name="org.apache.jetspeed.deploy.target"
+ value="${org.apache.jetspeed.env.deploy.target}"/>
+ <property name="org.apache.jetspeed.server.home"
+ value="${org.apache.jetspeed.server.home}"/>
+ <property name="org.apache.jetspeed.catalina.version.major"
+ value="${org.apache.jetspeed.catalina.version.major}"/>
+ <property name="org.apache.jetspeed.production.database.default.name"
+ value="${org.apache.jetspeed.production.database.default.name}"/>
+ <property name="org.apache.jetspeed.production.database.url"
+ value="${org.apache.jetspeed.production.database.url}"/>
+ <property name="org.apache.jetspeed.production.database.jdbc.drivers.path"
+ value="${org.apache.jetspeed.production.jdbc.drivers.path}"/>
+ <property name="org.apache.jetspeed.production.database.driver"
+ value="${org.apache.jetspeed.production.database.driver}"/>
+ <property name="org.apache.jetspeed.production.database.user"
+ value="${org.apache.jetspeed.production.database.user}"/>
+ <property name="org.apache.jetspeed.production.database.password"
+ value="${org.apache.jetspeed.production.database.password}"/>
+ <property name="org.apache.jetspeed.groupid"
+ value="org.apache.portals.jetspeed-2"/>
+ <property name="org.apache.jetspeed.version"
+ value="${org.apache.portals.jetspeed-2.version}"/>
+ <property name="org.apache.portals.bridges.version"
+ value="${org.apache.portals.bridges.version}"/>
+ <property name="org.apache.pluto.version"
+ value="${org.apache.pluto.version}"/>
+ <property name="portlet-api.version"
+ value="${portlet-api.version}"/>
+ <property name="org.apache.derby.version"
+ value="${org.apache.derby.version}"/>
+ <property name="hsqldb.version"
+ value="${hsqldb.version}"/>
+ </ant>
+
+ <!-- hot deployment to app server -->
+ <ant target="hot-deploy" antfile="build.xml" dir="${basedir}" inheritAll="off">
+ <property name="org.apache.jetspeed.deploy.enable"
+ value="${org.apache.jetspeed.env.hotdeploy}"/>
+ <property name="org.apache.jetspeed.deploy.target"
+ value="${org.apache.jetspeed.env.deploy.target}"/>
+ <property name="org.apache.jetspeed.server.home"
+ value="${org.apache.jetspeed.server.home}"/>
+ <property name="org.apache.jetspeed.groupid"
+ value="org.apache.portals.jetspeed-2"/>
+ <property name="org.apache.jetspeed.version"
+ value="${org.apache.portals.jetspeed-2.version}"/>
+ <property name="org.apache.portals.bridges.version"
+ value="${org.apache.portals.bridges.version}"/>
+ </ant>
+
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+
+ </executions>
+ <!--
+ Bug: All plugin dependencies must be copied to the first instance
+ of the maven-antrun-plugin run, (e.g. to the root pom), since the
+ first set of deps sticks for the entire maven2 execution cycle.
+ Bug: Plugin dependencies are not propagated from pluginManagement.
+ Bug: Versions must be specified here and not in dependencyManagement.
+
+ Note: All three ant dependencies are listed to keep nodeps in sync.
+ -->
+ <dependencies>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>${ant.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-launcher</artifactId>
+ <version>${ant.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ <version>${ant.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact-ant</artifactId>
+ <version>${org.apache.maven.artifact.ant.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+
+ </build>
+
+ <!-- Dependencies -->
+
+ <dependencies>
+
+ <!-- Build Dependencies -->
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>${artifactId}-etc</artifactId>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.portals.jetspeed-2</groupId>
+ <artifactId>jetspeed-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.portals.jetspeed-2</groupId>
+ <artifactId>jetspeed-commons</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>portlet-api</groupId>
+ <artifactId>portlet-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pluto</groupId>
+ <artifactId>pluto</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.portals.bridges</groupId>
+ <artifactId>portals-bridges-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.portals.jetspeed-2</groupId>
+ <artifactId>j2-admin</artifactId>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.portals.jetspeed-2</groupId>
+ <artifactId>jetspeed-layouts</artifactId>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>${artifactId}-portal</artifactId>
+ <type>war</type>
+ </dependency>
+
+ </dependencies>
+
+</project>
Propchange: portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/applications/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/applications/pom.xml?rev=387361&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/applications/pom.xml (added)
+++ portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/applications/pom.xml Mon Mar 20 16:47:37 2006
@@ -0,0 +1,62 @@
+<?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>
+
+ <!-- POM Identification -->
+
+ <groupId>${groupId}</groupId>
+ <version>${version}</version>
+ <artifactId>${artifactId}-applications</artifactId>
+ <parent>
+ <groupId>${groupId}</groupId>
+ <version>${version}</version>
+ <artifactId>${artifactId}</artifactId>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <packaging>pom</packaging>
+ <name>Jetspeed-2 Applications</name>
+
+ <!-- Application Modules -->
+
+ <modules>
+ </modules>
+
+ <!-- Application Dependencies -->
+
+ <dependencies>
+
+ <!-- Provided Dependencies -->
+ <dependency>
+ <groupId>org.apache.portals.jetspeed-2</groupId>
+ <artifactId>jetspeed-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.portals.jetspeed-2</groupId>
+ <artifactId>jetspeed-commons</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ </dependencies>
+
+</project>
Propchange: portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/applications/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/components/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/components/pom.xml?rev=387361&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/components/pom.xml (added)
+++ portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/components/pom.xml Mon Mar 20 16:47:37 2006
@@ -0,0 +1,62 @@
+<?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>
+
+ <!-- POM Identification -->
+
+ <groupId>${groupId}</groupId>
+ <version>${version}</version>
+ <artifactId>${artifactId}-components</artifactId>
+ <parent>
+ <groupId>${groupId}</groupId>
+ <version>${version}</version>
+ <artifactId>${artifactId}</artifactId>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <packaging>pom</packaging>
+ <name>Jetspeed-2 Components</name>
+
+ <!-- Component Modules -->
+
+ <modules>
+ </modules>
+
+ <!-- Component Dependencies -->
+
+ <dependencies>
+
+ <!-- Provided Dependencies -->
+ <dependency>
+ <groupId>org.apache.portals.jetspeed-2</groupId>
+ <artifactId>jetspeed-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.portals.jetspeed-2</groupId>
+ <artifactId>jetspeed-commons</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ </dependencies>
+
+</project>
Propchange: portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/components/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/assembly/readme.txt
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/assembly/readme.txt?rev=387361&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/assembly/readme.txt (added)
+++ portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/assembly/readme.txt Mon Mar 20 16:47:37 2006
@@ -0,0 +1,3 @@
+Directory: etc/assembly
+Contents: custom portal component assemblies
+Usage: overrides assemblies specified in portal/src/webapp/WEB-INF/assembly
Propchange: portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/assembly/readme.txt
------------------------------------------------------------------------------
svn:eol-style = native
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org