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/29 10:41:30 UTC
svn commit: r389706 - in /portals/jetspeed-2/trunk/maven-archetypes:
application/src/archetype/archetype-resources/
application/src/archetype/archetype-resources/src/webapp/WEB-INF/
component/src/archetype/META-INF/ component/src/archetype/archetype-re...
Author: rwatler
Date: Wed Mar 29 00:41:26 2006
New Revision: 389706
URL: http://svn.apache.org/viewcvs?rev=389706&view=rev
Log:
Maven2: archetypes update
Added:
portals/jetspeed-2/trunk/maven-archetypes/component/src/archetype/archetype-resources/src/
portals/jetspeed-2/trunk/maven-archetypes/component/src/archetype/archetype-resources/src/java/
portals/jetspeed-2/trunk/maven-archetypes/component/src/archetype/archetype-resources/src/java/Component.java (with props)
portals/jetspeed-2/trunk/maven-archetypes/component/src/archetype/archetype-resources/src/java/ComponentImpl.java (with props)
portals/jetspeed-2/trunk/maven-archetypes/component/src/archetype/archetype-resources/src/test/
portals/jetspeed-2/trunk/maven-archetypes/component/src/archetype/archetype-resources/src/test/TestComponent.java (with props)
portals/jetspeed-2/trunk/maven-archetypes/component/src/archetype/archetype-resources/src/test/log4j.properties (with props)
Modified:
portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/pom.xml
portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/src/webapp/WEB-INF/log4j.properties
portals/jetspeed-2/trunk/maven-archetypes/component/src/archetype/META-INF/archetype.xml
portals/jetspeed-2/trunk/maven-archetypes/component/src/archetype/archetype-resources/pom.xml
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/pom.xml
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/applications/pom.xml
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/components/pom.xml
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/pom.xml
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/pom.xml
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/pom.xml
Modified: portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/pom.xml?rev=389706&r1=389705&r2=389706&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/pom.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/pom.xml Wed Mar 29 00:41:26 2006
@@ -30,14 +30,11 @@
<parent>
<groupId>${groupId}</groupId>
<version>${version}</version>
- <artifactId>applications</artifactId>
+ <artifactId>portal-applications</artifactId>
<relativePath>../pom.xml</relativePath>
</parent>
<packaging>war</packaging>
- <name>${artifactId} Application</name>
- <description>
- ${artifactId} application implementation.
- </description>
+ <name>${artifactId} Portal Application</name>
<!-- Dependencies -->
@@ -55,7 +52,7 @@
<!-- Runtime Dependencies -->
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.apache.portals.jetspeed-2</groupId>
<artifactId>jetspeed-webapp-logging</artifactId>
<scope>runtime</scope>
</dependency>
Modified: portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/src/webapp/WEB-INF/log4j.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/src/webapp/WEB-INF/log4j.properties?rev=389706&r1=389705&r2=389706&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/src/webapp/WEB-INF/log4j.properties (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/src/webapp/WEB-INF/log4j.properties Wed Mar 29 00:41:26 2006
@@ -1,4 +1,4 @@
-s# Copyright 2006 The Apache Software Foundation
+# 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.
@@ -11,6 +11,7 @@
# 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.
+
# ------------------------------------------------------------------------
#
# Logging Configuration
Modified: portals/jetspeed-2/trunk/maven-archetypes/component/src/archetype/META-INF/archetype.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/component/src/archetype/META-INF/archetype.xml?rev=389706&r1=389705&r2=389706&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/component/src/archetype/META-INF/archetype.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/component/src/archetype/META-INF/archetype.xml Wed Mar 29 00:41:26 2006
@@ -23,4 +23,14 @@
<resources>
<resource>pom.xml</resource>
</resources>
+ <sources>
+ <source>src/java/Component.java</source>
+ <source>src/java/ComponentImpl.java</source>
+ </sources>
+ <testSources>
+ <source>src/test/TestComponent.java</source>
+ </testSources>
+ <testResources>
+ <resource>src/test/log4j.properties</resource>
+ </testResources>
</archetype>
Modified: portals/jetspeed-2/trunk/maven-archetypes/component/src/archetype/archetype-resources/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/component/src/archetype/archetype-resources/pom.xml?rev=389706&r1=389705&r2=389706&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/component/src/archetype/archetype-resources/pom.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/component/src/archetype/archetype-resources/pom.xml Wed Mar 29 00:41:26 2006
@@ -30,14 +30,11 @@
<parent>
<groupId>${groupId}</groupId>
<version>${version}</version>
- <artifactId>components</artifactId>
+ <artifactId>portal-components</artifactId>
<relativePath>../pom.xml</relativePath>
</parent>
<packaging>jar</packaging>
- <name>${artifactId} Component</name>
- <description>
- ${artifactId} component implementation.
- </description>
+ <name>${artifactId} Portal Component</name>
<!-- Dependencies -->
Added: portals/jetspeed-2/trunk/maven-archetypes/component/src/archetype/archetype-resources/src/java/Component.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/component/src/archetype/archetype-resources/src/java/Component.java?rev=389706&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/component/src/archetype/archetype-resources/src/java/Component.java (added)
+++ portals/jetspeed-2/trunk/maven-archetypes/component/src/archetype/archetype-resources/src/java/Component.java Wed Mar 29 00:41:26 2006
@@ -0,0 +1,26 @@
+/*
+ * 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 ${groupId};
+
+/**
+ * Component
+ *
+ * @author <a href="mailto:"></a>
+ * @version $Id:$
+ */
+public interface Component
+{
+}
Propchange: portals/jetspeed-2/trunk/maven-archetypes/component/src/archetype/archetype-resources/src/java/Component.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: portals/jetspeed-2/trunk/maven-archetypes/component/src/archetype/archetype-resources/src/java/ComponentImpl.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/component/src/archetype/archetype-resources/src/java/ComponentImpl.java?rev=389706&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/component/src/archetype/archetype-resources/src/java/ComponentImpl.java (added)
+++ portals/jetspeed-2/trunk/maven-archetypes/component/src/archetype/archetype-resources/src/java/ComponentImpl.java Wed Mar 29 00:41:26 2006
@@ -0,0 +1,42 @@
+/*
+ * 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 ${groupId};
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import ${groupId}.Component;
+
+/**
+ * ComponentImpl
+ *
+ * @author <a href="mailto:"></a>
+ * @version $Id:$
+ */
+public class ComponentImpl implements Component
+{
+ /**
+ * Class specific log instance.
+ */
+ private final static Log log = LogFactory.getLog(ComponentImpl.class);
+
+ /**
+ * ComponentImpl constructor.
+ */
+ public ComponentImpl()
+ {
+ }
+}
Propchange: portals/jetspeed-2/trunk/maven-archetypes/component/src/archetype/archetype-resources/src/java/ComponentImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: portals/jetspeed-2/trunk/maven-archetypes/component/src/archetype/archetype-resources/src/test/TestComponent.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/component/src/archetype/archetype-resources/src/test/TestComponent.java?rev=389706&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/component/src/archetype/archetype-resources/src/test/TestComponent.java (added)
+++ portals/jetspeed-2/trunk/maven-archetypes/component/src/archetype/archetype-resources/src/test/TestComponent.java Wed Mar 29 00:41:26 2006
@@ -0,0 +1,84 @@
+/*
+ * 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 ${groupId};
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+import ${groupId}.Component;
+import ${groupId}.ComponentImpl;
+
+/**
+ * TestComponent
+ *
+ * @author <a href="mailto:"></a>
+ * @version $Id:$
+ */
+public class TestComponent extends TestCase
+{
+ /**
+ * Class specific log instance.
+ */
+ private final static Log log = LogFactory.getLog(TestComponent.class);
+
+ /**
+ * Main test runner entry point.
+ */
+ public static void main(String args[])
+ {
+ junit.awtui.TestRunner.main(new String[]{TestComponent.class.getName()});
+ }
+
+ /**
+ * Test suite configuration for test*() methods in this class.
+ */
+ public static Test suite()
+ {
+ return new TestSuite(TestComponent.class);
+ }
+
+ /**
+ * Setup protocol method.
+ */
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+ }
+
+ /**
+ * Cleanup protocol method.
+ */
+ protected void tearDown() throws Exception
+ {
+ super.tearDown();
+ }
+
+ /**
+ * Unit test method.
+ */
+ public void testComponent() throws Exception
+ {
+ log.info("TestComponent start...");
+
+ log.info("TestComponent testing: " + ComponentImpl.class.getName());
+
+ log.info("TestComponent done.");
+ }
+}
Propchange: portals/jetspeed-2/trunk/maven-archetypes/component/src/archetype/archetype-resources/src/test/TestComponent.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: portals/jetspeed-2/trunk/maven-archetypes/component/src/archetype/archetype-resources/src/test/log4j.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/component/src/archetype/archetype-resources/src/test/log4j.properties?rev=389706&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/component/src/archetype/archetype-resources/src/test/log4j.properties (added)
+++ portals/jetspeed-2/trunk/maven-archetypes/component/src/archetype/archetype-resources/src/test/log4j.properties Wed Mar 29 00:41:26 2006
@@ -0,0 +1,41 @@
+# 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.
+
+# ------------------------------------------------------------------------
+#
+# Logging Configuration
+#
+# $Id:$
+#
+# ------------------------------------------------------------------------
+
+#
+# Default root logger
+#
+log4j.rootLogger = INFO, console
+
+#
+# Component logger
+#
+log4j.category.${groupId} = DEBUG, console
+log4j.additivity.${groupId} = false
+
+#
+# Console
+#
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+
+# Pattern to output the caller's file name and line number.
+log4j.appender.console.layout.ConversionPattern=%5p: %c - %m%n
Propchange: portals/jetspeed-2/trunk/maven-archetypes/component/src/archetype/archetype-resources/src/test/log4j.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified: 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=389706&r1=389705&r2=389706&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/pom.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/pom.xml Wed Mar 29 00:41:26 2006
@@ -26,7 +26,7 @@
<groupId>${groupId}</groupId>
<version>${version}</version>
- <artifactId>${artifactId}-app-servers</artifactId>
+ <artifactId>portal-app-servers</artifactId>
<parent>
<groupId>${groupId}</groupId>
<version>${version}</version>
@@ -34,7 +34,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
<packaging>pom</packaging>
- <name>Jetspeed-2 Portal Application Server Deployment</name>
+ <name>${artifactId} Portal Application Server Deployment</name>
<!-- Build Configuration -->
Modified: 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=389706&r1=389705&r2=389706&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/applications/pom.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/applications/pom.xml Wed Mar 29 00:41:26 2006
@@ -26,7 +26,7 @@
<groupId>${groupId}</groupId>
<version>${version}</version>
- <artifactId>${artifactId}-applications</artifactId>
+ <artifactId>portal-applications</artifactId>
<parent>
<groupId>${groupId}</groupId>
<version>${version}</version>
@@ -34,7 +34,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
<packaging>pom</packaging>
- <name>Jetspeed-2 Applications</name>
+ <name>${artifactId} Portal Applications</name>
<!-- Application Modules -->
Modified: 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=389706&r1=389705&r2=389706&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/components/pom.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/components/pom.xml Wed Mar 29 00:41:26 2006
@@ -26,7 +26,7 @@
<groupId>${groupId}</groupId>
<version>${version}</version>
- <artifactId>${artifactId}-components</artifactId>
+ <artifactId>portal-components</artifactId>
<parent>
<groupId>${groupId}</groupId>
<version>${version}</version>
@@ -34,7 +34,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
<packaging>pom</packaging>
- <name>Jetspeed-2 Components</name>
+ <name>${artifactId} Portal Components</name>
<!-- Component Modules -->
Modified: portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/pom.xml?rev=389706&r1=389705&r2=389706&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/pom.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/pom.xml Wed Mar 29 00:41:26 2006
@@ -26,7 +26,7 @@
<groupId>${groupId}</groupId>
<version>${version}</version>
- <artifactId>${artifactId}-etc</artifactId>
+ <artifactId>portal-etc</artifactId>
<parent>
<groupId>${groupId}</groupId>
<version>${version}</version>
@@ -34,7 +34,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
<packaging>pom</packaging>
- <name>Jetspeed-2 Portal Database</name>
+ <name>${artifactId} Portal Database</name>
<!-- Profiles -->
Modified: portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/pom.xml?rev=389706&r1=389705&r2=389706&view=diff
==============================================================================
--- 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 Wed Mar 29 00:41:26 2006
@@ -31,7 +31,7 @@
<artifactId>${artifactId}</artifactId>
<version>${version}</version>
<packaging>pom</packaging>
- <name>Jetspeed-2 Enterprise Portal</name>
+ <name>${artifactId} Portal</name>
<!-- Profiles -->
Modified: portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/pom.xml?rev=389706&r1=389705&r2=389706&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/pom.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/pom.xml Wed Mar 29 00:41:26 2006
@@ -34,7 +34,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
<packaging>war</packaging>
- <name>Jetspeed-2 Enterprise Portal WAR</name>
+ <name>${artifactId} Portal WAR</name>
<!-- Build Configuration -->
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org