[jboss-svn-commits] JBL Code SVN: r17724 - in labs/jbosslabs/labs-3.0-build: labs-archetypes and 14 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Fri Jan 11 10:31:08 EST 2008


Author: szimano
Date: 2008-01-11 10:31:08 -0500 (Fri, 11 Jan 2008)
New Revision: 17724

Added:
   labs/jbosslabs/labs-3.0-build/labs-archetypes/labs-service-ear-archetype/
   labs/jbosslabs/labs-3.0-build/labs-archetypes/labs-service-ear-archetype/pom.xml
   labs/jbosslabs/labs-3.0-build/labs-archetypes/labs-service-ear-archetype/src/
   labs/jbosslabs/labs-3.0-build/labs-archetypes/labs-service-ear-archetype/src/main/
   labs/jbosslabs/labs-3.0-build/labs-archetypes/labs-service-ear-archetype/src/main/resources/
   labs/jbosslabs/labs-3.0-build/labs-archetypes/labs-service-ear-archetype/src/main/resources/META-INF/
   labs/jbosslabs/labs-3.0-build/labs-archetypes/labs-service-ear-archetype/src/main/resources/META-INF/maven/
   labs/jbosslabs/labs-3.0-build/labs-archetypes/labs-service-ear-archetype/src/main/resources/META-INF/maven/archetype.xml
   labs/jbosslabs/labs-3.0-build/labs-archetypes/labs-service-ear-archetype/src/main/resources/archetype-resources/
   labs/jbosslabs/labs-3.0-build/labs-archetypes/labs-service-ear-archetype/src/main/resources/archetype-resources/pom.xml
   labs/jbosslabs/labs-3.0-build/labs-archetypes/labs-service-ear-archetype/src/main/resources/archetype-resources/src/
   labs/jbosslabs/labs-3.0-build/labs-archetypes/labs-service-ear-archetype/src/main/resources/archetype-resources/src/main/
   labs/jbosslabs/labs-3.0-build/labs-archetypes/labs-service-ear-archetype/src/main/resources/archetype-resources/src/main/java/
   labs/jbosslabs/labs-3.0-build/labs-archetypes/labs-service-ear-archetype/src/main/resources/archetype-resources/src/main/java/App.java
   labs/jbosslabs/labs-3.0-build/labs-archetypes/labs-service-ear-archetype/src/main/resources/archetype-resources/src/test/
   labs/jbosslabs/labs-3.0-build/labs-archetypes/labs-service-ear-archetype/src/main/resources/archetype-resources/src/test/java/
   labs/jbosslabs/labs-3.0-build/labs-archetypes/labs-service-ear-archetype/src/main/resources/archetype-resources/src/test/java/AppTest.java
Modified:
   labs/jbosslabs/labs-3.0-build/labs-archetypes/pom.xml
   labs/jbosslabs/labs-3.0-build/maven-labs-plugin/pom.xml
   labs/jbosslabs/labs-3.0-build/maven-labs-plugin/src/main/java/org/jboss/labs/plugin/LabsMojo.java
   labs/jbosslabs/labs-3.0-build/pom.xml
Log:
jboss parent, snapshot and archetype sceleton


Property changes on: labs/jbosslabs/labs-3.0-build/labs-archetypes/labs-service-ear-archetype
___________________________________________________________________
Name: svn:ignore
   + target
.classpath
.project
.settings



Added: labs/jbosslabs/labs-3.0-build/labs-archetypes/labs-service-ear-archetype/pom.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/labs-archetypes/labs-service-ear-archetype/pom.xml	                        (rev 0)
+++ labs/jbosslabs/labs-3.0-build/labs-archetypes/labs-service-ear-archetype/pom.xml	2008-01-11 15:31:08 UTC (rev 17724)
@@ -0,0 +1,13 @@
+<?xml version="1.0"?><project>
+  <parent>
+    <artifactId>labs-archetypes</artifactId>
+    <groupId>org.jboss.labs</groupId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.jboss.labs</groupId>
+  <artifactId>labs-service-ear-archetype</artifactId>
+  <name>Archetype - labs-service-ear-archetype</name>
+  <version>1.0-SNAPSHOT</version>
+  <url>http://maven.apache.org</url>
+</project>
\ No newline at end of file

Added: labs/jbosslabs/labs-3.0-build/labs-archetypes/labs-service-ear-archetype/src/main/resources/META-INF/maven/archetype.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/labs-archetypes/labs-service-ear-archetype/src/main/resources/META-INF/maven/archetype.xml	                        (rev 0)
+++ labs/jbosslabs/labs-3.0-build/labs-archetypes/labs-service-ear-archetype/src/main/resources/META-INF/maven/archetype.xml	2008-01-11 15:31:08 UTC (rev 17724)
@@ -0,0 +1,9 @@
+<archetype>
+  <id>labs-service-ear-archetype</id>
+  <sources>
+    <source>src/main/java/App.java</source>
+  </sources>
+  <testSources>
+    <source>src/test/java/AppTest.java</source>
+  </testSources>
+</archetype>

Added: labs/jbosslabs/labs-3.0-build/labs-archetypes/labs-service-ear-archetype/src/main/resources/archetype-resources/pom.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/labs-archetypes/labs-service-ear-archetype/src/main/resources/archetype-resources/pom.xml	                        (rev 0)
+++ labs/jbosslabs/labs-3.0-build/labs-archetypes/labs-service-ear-archetype/src/main/resources/archetype-resources/pom.xml	2008-01-11 15:31:08 UTC (rev 17724)
@@ -0,0 +1,15 @@
+<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>
+  <groupId>$org.jboss.labs</groupId>
+  <artifactId>$labs-service-ear-archetype</artifactId>
+  <version>$1.0-SNAPSHOT</version>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>

Added: labs/jbosslabs/labs-3.0-build/labs-archetypes/labs-service-ear-archetype/src/main/resources/archetype-resources/src/main/java/App.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/labs-archetypes/labs-service-ear-archetype/src/main/resources/archetype-resources/src/main/java/App.java	                        (rev 0)
+++ labs/jbosslabs/labs-3.0-build/labs-archetypes/labs-service-ear-archetype/src/main/resources/archetype-resources/src/main/java/App.java	2008-01-11 15:31:08 UTC (rev 17724)
@@ -0,0 +1,13 @@
+package $org.jboss.labs;
+
+/**
+ * Hello world!
+ *
+ */
+public class App 
+{
+    public static void main( String[] args )
+    {
+        System.out.println( "Hello World!" );
+    }
+}

Added: labs/jbosslabs/labs-3.0-build/labs-archetypes/labs-service-ear-archetype/src/main/resources/archetype-resources/src/test/java/AppTest.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/labs-archetypes/labs-service-ear-archetype/src/main/resources/archetype-resources/src/test/java/AppTest.java	                        (rev 0)
+++ labs/jbosslabs/labs-3.0-build/labs-archetypes/labs-service-ear-archetype/src/main/resources/archetype-resources/src/test/java/AppTest.java	2008-01-11 15:31:08 UTC (rev 17724)
@@ -0,0 +1,38 @@
+package $org.jboss.labs;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest 
+    extends TestCase
+{
+    /**
+     * Create the test case
+     *
+     * @param testName name of the test case
+     */
+    public AppTest( String testName )
+    {
+        super( testName );
+    }
+
+    /**
+     * @return the suite of tests being tested
+     */
+    public static Test suite()
+    {
+        return new TestSuite( AppTest.class );
+    }
+
+    /**
+     * Rigourous Test :-)
+     */
+    public void testApp()
+    {
+        assertTrue( true );
+    }
+}

Modified: labs/jbosslabs/labs-3.0-build/labs-archetypes/pom.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/labs-archetypes/pom.xml	2008-01-11 14:33:21 UTC (rev 17723)
+++ labs/jbosslabs/labs-3.0-build/labs-archetypes/pom.xml	2008-01-11 15:31:08 UTC (rev 17724)
@@ -13,5 +13,6 @@
   <packaging>pom</packaging>
   <modules>
     <module>labs-service-archetype</module>
+    <module>labs-service-ear-archetype</module>
   </modules>
 </project>
\ No newline at end of file

Modified: labs/jbosslabs/labs-3.0-build/maven-labs-plugin/pom.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/maven-labs-plugin/pom.xml	2008-01-11 14:33:21 UTC (rev 17723)
+++ labs/jbosslabs/labs-3.0-build/maven-labs-plugin/pom.xml	2008-01-11 15:31:08 UTC (rev 17724)
@@ -1,5 +1,10 @@
 <?xml version="1.0"?>
 <project>
+	<parent>
+    		<groupId>org.jboss</groupId>
+    		<artifactId>jboss-parent</artifactId>
+    		<version>3</version>
+  	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.jboss.labs</groupId>
 	<artifactId>maven-labs-plugin</artifactId>

Modified: labs/jbosslabs/labs-3.0-build/maven-labs-plugin/src/main/java/org/jboss/labs/plugin/LabsMojo.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/maven-labs-plugin/src/main/java/org/jboss/labs/plugin/LabsMojo.java	2008-01-11 14:33:21 UTC (rev 17723)
+++ labs/jbosslabs/labs-3.0-build/maven-labs-plugin/src/main/java/org/jboss/labs/plugin/LabsMojo.java	2008-01-11 15:31:08 UTC (rev 17724)
@@ -72,31 +72,33 @@
 			loadProperties(project.getParent());
 		}
 
-		File props = new File(project.getBasedir().getAbsolutePath() + "/"
-				+ LABS_PROPERTIES);
-		if (props.exists()) {
-			Properties p = new Properties();
-			FileInputStream fis = null;
-			try {
-				fis = new FileInputStream(props);
-				p.load(fis);
-			} catch (FileNotFoundException e) {
-				getLog().error("Couldn't load labs file", e);
-			} catch (IOException e) {
-				getLog().error("Couldn't load properties", e);
-			} finally {
+		if (project.getBasedir() != null) {
+			File props = new File(project.getBasedir().getAbsolutePath() + "/"
+					+ LABS_PROPERTIES);
+			if (props.exists()) {
+				Properties p = new Properties();
+				FileInputStream fis = null;
 				try {
-					fis.close();
+					fis = new FileInputStream(props);
+					p.load(fis);
+				} catch (FileNotFoundException e) {
+					getLog().error("Couldn't load labs file", e);
 				} catch (IOException e) {
-					// 
+					getLog().error("Couldn't load properties", e);
+				} finally {
+					try {
+						fis.close();
+					} catch (IOException e) {
+						// 
+					}
 				}
-			}
-			Enumeration<Object> en = p.keys();
-			while (en.hasMoreElements()) {
-				String key = en.nextElement().toString();
-				String value = p.getProperty(key);
+				Enumeration<Object> en = p.keys();
+				while (en.hasMoreElements()) {
+					String key = en.nextElement().toString();
+					String value = p.getProperty(key);
 
-				System.setProperty(key, value);
+					System.setProperty(key, value);
+				}
 			}
 		}
 	}

Modified: labs/jbosslabs/labs-3.0-build/pom.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/pom.xml	2008-01-11 14:33:21 UTC (rev 17723)
+++ labs/jbosslabs/labs-3.0-build/pom.xml	2008-01-11 15:31:08 UTC (rev 17724)
@@ -6,6 +6,11 @@
 	<artifactId>labs</artifactId>
 	<packaging>pom</packaging>
 	<name>JBoss Labs</name>
+	<parent>
+    		<groupId>org.jboss</groupId>
+    		<artifactId>jboss-parent</artifactId>
+    		<version>3</version>
+  	</parent>
 	<modules>
 		<module>thirdparty</module>
 		<module>labs-archetypes</module>
@@ -14,6 +19,7 @@
 		<module>foo-service</module>
 		<module>views</module>
     <module>authorization</module>
+    <module>foo-service-ear</module>
   </modules>
 <scm>
     <connection>scm:svn:http://anonsvn.jboss.org/repos/labs/labs/jbosslabs/labs-3.0-build</connection>
@@ -55,6 +61,17 @@
 			<id>jboss-maven2</id>
 			<url>http://repository.jboss.com/maven2</url>
 		</repository>
+		<repository>
+      			<id>jboss-snapshots</id>
+      			<name>JBoss Snapshot Repository</name>
+      			<url>http://snapshots.jboss.org/maven2</url>
+      			<releases>
+        			<enabled>false</enabled>
+      			</releases>
+      			<snapshots>
+        			<enabled>true</enabled>
+      			</snapshots>
+    		</repository>
 	</repositories>
 
 	<build>
@@ -106,4 +123,4 @@
 			</plugin>
 		</plugins>
 	</build>
-</project>
\ No newline at end of file
+</project>




More information about the jboss-svn-commits mailing list