[jbosstools-commits] JBoss Tools SVN: r23093 - in trunk: archives and 22 other directories.

jbosstools-commits at lists.jboss.org jbosstools-commits at lists.jboss.org
Tue Jun 29 14:22:10 EDT 2010


Author: dgolovin
Date: 2010-06-29 14:22:08 -0400 (Tue, 29 Jun 2010)
New Revision: 23093

Added:
   trunk/build/libs/
   trunk/build/libs/org.eclemma.runtime.equinox-1.1.0.200908261008.jar
   trunk/build/libs/pom.xml
Modified:
   trunk/archives/features/org.jboss.ide.eclipse.archives.feature/pom.xml
   trunk/archives/features/org.jboss.ide.eclipse.archives.test.feature/pom.xml
   trunk/archives/features/pom.xml
   trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/pom.xml
   trunk/archives/plugins/org.jboss.ide.eclipse.archives.jdt.integration/pom.xml
   trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/pom.xml
   trunk/archives/plugins/pom.xml
   trunk/archives/pom.xml
   trunk/archives/site/pom.xml
   trunk/archives/tests/org.jboss.ide.eclipse.archives.test/pom.xml
   trunk/archives/tests/org.jboss.ide.eclipse.archives.ui.test/pom.xml
   trunk/archives/tests/pom.xml
   trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.feature/pom.xml
   trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature/pom.xml
   trunk/freemarker/features/pom.xml
   trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/pom.xml
   trunk/freemarker/plugins/pom.xml
   trunk/freemarker/pom.xml
   trunk/freemarker/site/pom.xml
   trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/pom.xml
   trunk/freemarker/tests/pom.xml
   trunk/parent-pom.xml
   trunk/pom.xml
Log:
1. build/libs module added to fix missing dependency for code coverage. It contains eclemma extension required for coverage profile and it installs it during building with root pom.xml
2. Coverage report enabled for archives and freenarker components
3. Repo structure aligned to svn structure for archives and freemarker components


Modified: trunk/archives/features/org.jboss.ide.eclipse.archives.feature/pom.xml
===================================================================
--- trunk/archives/features/org.jboss.ide.eclipse.archives.feature/pom.xml	2010-06-29 16:57:48 UTC (rev 23092)
+++ trunk/archives/features/org.jboss.ide.eclipse.archives.feature/pom.xml	2010-06-29 18:22:08 UTC (rev 23093)
@@ -7,7 +7,7 @@
 	  <artifactId>org.jboss.tools.parent.pom</artifactId>
 	  <version>0.0.1-SNAPSHOT</version>
 	</parent>
-	<groupId>org.jboss.tools</groupId>
+	<groupId>org.jboss.tools.archives.features</groupId>
 	<artifactId>org.jboss.ide.eclipse.archives.feature</artifactId> 
 	<version>3.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>

Modified: trunk/archives/features/org.jboss.ide.eclipse.archives.test.feature/pom.xml
===================================================================
--- trunk/archives/features/org.jboss.ide.eclipse.archives.test.feature/pom.xml	2010-06-29 16:57:48 UTC (rev 23092)
+++ trunk/archives/features/org.jboss.ide.eclipse.archives.test.feature/pom.xml	2010-06-29 18:22:08 UTC (rev 23093)
@@ -7,7 +7,7 @@
 	  <artifactId>org.jboss.tools.parent.pom</artifactId>
 	  <version>0.0.1-SNAPSHOT</version>
 	</parent>
-	<groupId>org.jboss.tools</groupId>
+	<groupId>org.jboss.tools.archives.features</groupId>
 	<artifactId>org.jboss.ide.eclipse.archives.test.feature</artifactId> 
 	<version>3.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>

Modified: trunk/archives/features/pom.xml
===================================================================
--- trunk/archives/features/pom.xml	2010-06-29 16:57:48 UTC (rev 23092)
+++ trunk/archives/features/pom.xml	2010-06-29 18:22:08 UTC (rev 23093)
@@ -1,19 +1,14 @@
 <project
 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<modelVersion>4.0.0</modelVersion>
-	<parent>
-	  <relativePath>../../parent-pom.xml</relativePath>
-	  <groupId>org.jboss.tools</groupId>
-	  <artifactId>org.jboss.tools.parent.pom</artifactId>
-	  <version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<groupId>org.jboss.tools</groupId>
-	<artifactId>archives.features</artifactId>
+	<groupId>org.jboss.tools.archives</groupId>
+	<artifactId>features</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
+	<name>archives.features</name>
 	<packaging>pom</packaging>
 	<modules>
 		<module>org.jboss.ide.eclipse.archives.feature</module>
 		<module>org.jboss.ide.eclipse.archives.test.feature</module>
 	</modules>
 </project>
-	
\ No newline at end of file
+	

Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/pom.xml
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/pom.xml	2010-06-29 16:57:48 UTC (rev 23092)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/pom.xml	2010-06-29 18:22:08 UTC (rev 23093)
@@ -7,7 +7,7 @@
 	  <artifactId>org.jboss.tools.parent.pom</artifactId>
 	  <version>0.0.1-SNAPSHOT</version>
 	</parent>
-	<groupId>org.jboss.tools</groupId>
+	<groupId>org.jboss.tools.archives.plugins</groupId>
 	<artifactId>org.jboss.ide.eclipse.archives.core</artifactId> 
 	<version>3.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>

Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.jdt.integration/pom.xml
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.jdt.integration/pom.xml	2010-06-29 16:57:48 UTC (rev 23092)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.jdt.integration/pom.xml	2010-06-29 18:22:08 UTC (rev 23093)
@@ -7,7 +7,7 @@
 	  <artifactId>org.jboss.tools.parent.pom</artifactId>
 	  <version>0.0.1-SNAPSHOT</version>
 	</parent>
-	<groupId>org.jboss.tools</groupId>
+	<groupId>org.jboss.tools.archives.plugins</groupId>
 	<artifactId>org.jboss.ide.eclipse.archives.jdt.integration</artifactId> 
 	<version>3.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>

Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/pom.xml
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/pom.xml	2010-06-29 16:57:48 UTC (rev 23092)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/pom.xml	2010-06-29 18:22:08 UTC (rev 23093)
@@ -7,7 +7,7 @@
 	  <artifactId>org.jboss.tools.parent.pom</artifactId>
 	  <version>0.0.1-SNAPSHOT</version>
 	</parent>
-	<groupId>org.jboss.tools</groupId>
+	<groupId>org.jboss.tools.archives.plugins</groupId>
 	<artifactId>org.jboss.ide.eclipse.archives.ui</artifactId> 
 	<version>3.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>

Modified: trunk/archives/plugins/pom.xml
===================================================================
--- trunk/archives/plugins/pom.xml	2010-06-29 16:57:48 UTC (rev 23092)
+++ trunk/archives/plugins/pom.xml	2010-06-29 18:22:08 UTC (rev 23093)
@@ -1,15 +1,10 @@
 <project
 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<modelVersion>4.0.0</modelVersion>
-	<parent>
-	  <relativePath>../../parent-pom.xml</relativePath>
-	  <groupId>org.jboss.tools</groupId>
-	  <artifactId>org.jboss.tools.parent.pom</artifactId>
-	  <version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<groupId>org.jboss.tools</groupId>
-	<artifactId>archives.plugins</artifactId>
+	<groupId>org.jboss.tools.archives</groupId>
+	<artifactId>plugins</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
+	<name>archives.plugins</name>
 	<packaging>pom</packaging>
 	<modules>
 		<module>org.jboss.ide.eclipse.archives.core</module>
@@ -17,4 +12,4 @@
 		<module>org.jboss.ide.eclipse.archives.ui</module>
 	</modules>
 </project>
-	
\ No newline at end of file
+	

Modified: trunk/archives/pom.xml
===================================================================
--- trunk/archives/pom.xml	2010-06-29 16:57:48 UTC (rev 23092)
+++ trunk/archives/pom.xml	2010-06-29 18:22:08 UTC (rev 23093)
@@ -1,15 +1,10 @@
 <project
 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<modelVersion>4.0.0</modelVersion>
-	<parent>
-	  <relativePath>../parent-pom.xml</relativePath>
-	  <groupId>org.jboss.tools</groupId>
-	  <artifactId>org.jboss.tools.parent.pom</artifactId>
-	  <version>0.0.1-SNAPSHOT</version>
-	</parent>
 	<groupId>org.jboss.tools</groupId>
-	<artifactId>archives.all</artifactId>
+	<artifactId>archives</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
+	<name>archives.all</name>
 	<packaging>pom</packaging>
 	<modules>
 		<module>features</module>

Modified: trunk/archives/site/pom.xml
===================================================================
--- trunk/archives/site/pom.xml	2010-06-29 16:57:48 UTC (rev 23092)
+++ trunk/archives/site/pom.xml	2010-06-29 18:22:08 UTC (rev 23093)
@@ -6,8 +6,9 @@
 		<artifactId>org.jboss.tools.parent.pom</artifactId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
-	<groupId>org.jboss.tools</groupId>
-	<artifactId>archives.site</artifactId> 
+	<groupId>org.jboss.tools.archives</groupId>
+	<artifactId>site</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
+	<name>archives.site</name>
 	<packaging>eclipse-update-site</packaging>
 </project>

Modified: trunk/archives/tests/org.jboss.ide.eclipse.archives.test/pom.xml
===================================================================
--- trunk/archives/tests/org.jboss.ide.eclipse.archives.test/pom.xml	2010-06-29 16:57:48 UTC (rev 23092)
+++ trunk/archives/tests/org.jboss.ide.eclipse.archives.test/pom.xml	2010-06-29 18:22:08 UTC (rev 23093)
@@ -7,10 +7,14 @@
 	  <artifactId>org.jboss.tools.parent.pom</artifactId>
 	  <version>0.0.1-SNAPSHOT</version>
 	</parent>
-	<groupId>org.jboss.tools</groupId>
+	<groupId>org.jboss.tools.archives.tests</groupId>
 	<artifactId>org.jboss.ide.eclipse.archives.test</artifactId> 
 	<version>3.1.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
+	<properties>
+		<emma.filter>org.jboss.ide.eclipse.archives.core*</emma.filter>
+		<emma.instrument.bundles>org.jboss.ide.eclipse.archives.core</emma.instrument.bundles>
+	</properties>
 	<build>
 		<plugins>
 			<plugin>

Modified: trunk/archives/tests/org.jboss.ide.eclipse.archives.ui.test/pom.xml
===================================================================
--- trunk/archives/tests/org.jboss.ide.eclipse.archives.ui.test/pom.xml	2010-06-29 16:57:48 UTC (rev 23092)
+++ trunk/archives/tests/org.jboss.ide.eclipse.archives.ui.test/pom.xml	2010-06-29 18:22:08 UTC (rev 23093)
@@ -7,8 +7,12 @@
 	  <artifactId>org.jboss.tools.parent.pom</artifactId>
 	  <version>0.0.1-SNAPSHOT</version>
 	</parent>
-	<groupId>org.jboss.tools</groupId>
+	<groupId>org.jboss.tools.archives.tests</groupId>
 	<artifactId>org.jboss.ide.eclipse.archives.ui.test</artifactId> 
 	<version>3.1.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
+	<properties>
+		<emma.filter>org.jboss.ide.eclipse.archives.ui*</emma.filter>
+		<emma.instrument.bundles>org.jboss.ide.eclipse.archives.ui</emma.instrument.bundles>
+	</properties>
 </project>

Modified: trunk/archives/tests/pom.xml
===================================================================
--- trunk/archives/tests/pom.xml	2010-06-29 16:57:48 UTC (rev 23092)
+++ trunk/archives/tests/pom.xml	2010-06-29 18:22:08 UTC (rev 23093)
@@ -1,19 +1,14 @@
 <project
 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<modelVersion>4.0.0</modelVersion>
-	<parent>
-	  <relativePath>../../parent-pom.xml</relativePath>
-	  <groupId>org.jboss.tools</groupId>
-	  <artifactId>org.jboss.tools.parent.pom</artifactId>
-	  <version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<groupId>org.jboss.tools</groupId>
-	<artifactId>archives.tests</artifactId>
+	<groupId>org.jboss.tools.archives</groupId>
+	<artifactId>tests</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
+	<name>archives.tests</name>
 	<packaging>pom</packaging>
 	<modules>
 		<module>org.jboss.ide.eclipse.archives.test</module>
 		<module>org.jboss.ide.eclipse.archives.ui.test</module>
 	</modules>
 </project>
-	
\ No newline at end of file
+	

Added: trunk/build/libs/org.eclemma.runtime.equinox-1.1.0.200908261008.jar
===================================================================
(Binary files differ)


Property changes on: trunk/build/libs/org.eclemma.runtime.equinox-1.1.0.200908261008.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/build/libs/pom.xml
===================================================================
--- trunk/build/libs/pom.xml	                        (rev 0)
+++ trunk/build/libs/pom.xml	2010-06-29 18:22:08 UTC (rev 23093)
@@ -0,0 +1,44 @@
+<project
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+<groupId>org.jboss.tools.build</groupId>
+<artifactId>libs</artifactId>
+<version>1.0.0-SNAPSHOT</version>
+<packaging>pom</packaging>
+<profiles>
+	<profile>
+		<id>coverage</id>
+		<activation>
+			<property>
+				<name>coverage</name>
+			</property>
+		</activation>
+		<build>
+			<plugins>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-install-plugin</artifactId>
+					<version>2.3.1</version>
+					  <executions>
+					    <execution>
+					      <id>eclemma-install</id>
+					      <goals>
+						<goal>install-file</goal>
+					      </goals>
+					      <phase>package</phase>
+					      <configuration>
+						<file>org.eclemma.runtime.equinox-1.1.0.200908261008.jar</file>
+						<groupId>org.eclemma.runtime.equinox</groupId>
+						<artifactId>org.eclemma.runtime.equinox</artifactId>
+						<version>1.1.0.200908261008</version>
+						<packaging>jar</packaging>
+	   				      </configuration>
+					  </execution>
+					</executions>
+				</plugin>
+			</plugins>
+		</build>
+	</profile>
+
+</profiles>
+</project>

Modified: trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.feature/pom.xml
===================================================================
--- trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.feature/pom.xml	2010-06-29 16:57:48 UTC (rev 23092)
+++ trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.feature/pom.xml	2010-06-29 18:22:08 UTC (rev 23093)
@@ -7,7 +7,7 @@
 	  <artifactId>org.jboss.tools.parent.pom</artifactId>
 	  <version>0.0.1-SNAPSHOT</version>
 	</parent>
-	<groupId>org.jboss.tools</groupId>
+	<groupId>org.jboss.tools.freemarker.features</groupId>
 	<artifactId>org.jboss.ide.eclipse.freemarker.feature</artifactId> 
 	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>

Modified: trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature/pom.xml
===================================================================
--- trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature/pom.xml	2010-06-29 16:57:48 UTC (rev 23092)
+++ trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature/pom.xml	2010-06-29 18:22:08 UTC (rev 23093)
@@ -7,7 +7,7 @@
 	  <artifactId>org.jboss.tools.parent.pom</artifactId>
 	  <version>0.0.1-SNAPSHOT</version>
 	</parent>
-	<groupId>org.jboss.tools</groupId>
+	<groupId>org.jboss.tools.freemarker.features</groupId>
 	<artifactId>org.jboss.ide.eclipse.freemarker.test.feature</artifactId> 
 	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>

Modified: trunk/freemarker/features/pom.xml
===================================================================
--- trunk/freemarker/features/pom.xml	2010-06-29 16:57:48 UTC (rev 23092)
+++ trunk/freemarker/features/pom.xml	2010-06-29 18:22:08 UTC (rev 23093)
@@ -1,19 +1,14 @@
 <project
 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<modelVersion>4.0.0</modelVersion>
-	<parent>
-	  <relativePath>../../parent-pom.xml</relativePath>
-	  <groupId>org.jboss.tools</groupId>
-	  <artifactId>org.jboss.tools.parent.pom</artifactId>
-	  <version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<groupId>org.jboss.tools</groupId>
-	<artifactId>freemarker.features</artifactId>
+	<groupId>org.jboss.tools.freemarker</groupId>
+	<artifactId>features</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
+	<name>freemarker.features</name>
 	<packaging>pom</packaging>
 	<modules>
 		<module>org.jboss.ide.eclipse.freemarker.feature</module>
 		<module>org.jboss.ide.eclipse.freemarker.test.feature</module>
 	</modules>
 </project>
-	
\ No newline at end of file
+	

Modified: trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/pom.xml
===================================================================
--- trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/pom.xml	2010-06-29 16:57:48 UTC (rev 23092)
+++ trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/pom.xml	2010-06-29 18:22:08 UTC (rev 23093)
@@ -7,7 +7,7 @@
 	  <artifactId>org.jboss.tools.parent.pom</artifactId>
 	  <version>0.0.1-SNAPSHOT</version>
 	</parent>
-	<groupId>org.jboss.tools</groupId>
+	<groupId>org.jboss.tools.freemarker.plugins</groupId>
 	<artifactId>org.jboss.ide.eclipse.freemarker</artifactId> 
 	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>

Modified: trunk/freemarker/plugins/pom.xml
===================================================================
--- trunk/freemarker/plugins/pom.xml	2010-06-29 16:57:48 UTC (rev 23092)
+++ trunk/freemarker/plugins/pom.xml	2010-06-29 18:22:08 UTC (rev 23093)
@@ -1,18 +1,13 @@
 <project
 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<modelVersion>4.0.0</modelVersion>
-	<parent>
-	  <relativePath>../../parent-pom.xml</relativePath>
-	  <groupId>org.jboss.tools</groupId>
-	  <artifactId>org.jboss.tools.parent.pom</artifactId>
-	  <version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<groupId>org.jboss.tools</groupId>
-	<artifactId>freemarker.plugins</artifactId>
+	<groupId>org.jboss.tools.freemarker</groupId>
+	<artifactId>plugins</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<packaging>pom</packaging>
+	<name>freemarker.plugins</name>
 	<modules>
 		<module>org.jboss.ide.eclipse.freemarker</module>
 	</modules>
 </project>
-	
\ No newline at end of file
+	

Modified: trunk/freemarker/pom.xml
===================================================================
--- trunk/freemarker/pom.xml	2010-06-29 16:57:48 UTC (rev 23092)
+++ trunk/freemarker/pom.xml	2010-06-29 18:22:08 UTC (rev 23093)
@@ -1,15 +1,10 @@
 <project
 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<modelVersion>4.0.0</modelVersion>
-	<parent>
-	  <relativePath>../parent-pom.xml</relativePath>
-	  <groupId>org.jboss.tools</groupId>
-	  <artifactId>org.jboss.tools.parent.pom</artifactId>
-	  <version>0.0.1-SNAPSHOT</version>
-	</parent>
 	<groupId>org.jboss.tools</groupId>
-	<artifactId>freemarker.all</artifactId>
+	<artifactId>freemarker</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
+	<name>freemarker.all</name>
 	<packaging>pom</packaging>
 	<modules>
 		<module>features</module>

Modified: trunk/freemarker/site/pom.xml
===================================================================
--- trunk/freemarker/site/pom.xml	2010-06-29 16:57:48 UTC (rev 23092)
+++ trunk/freemarker/site/pom.xml	2010-06-29 18:22:08 UTC (rev 23093)
@@ -6,8 +6,9 @@
 		<artifactId>org.jboss.tools.parent.pom</artifactId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
-	<groupId>org.jboss.tools</groupId>
-	<artifactId>freemarker.site</artifactId> 
+	<groupId>org.jboss.tools.freemarker</groupId>
+	<artifactId>site</artifactId> 
 	<version>0.0.1-SNAPSHOT</version>
+	<name>freemarker.site</name>
 	<packaging>eclipse-update-site</packaging>
 </project>

Modified: trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/pom.xml
===================================================================
--- trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/pom.xml	2010-06-29 16:57:48 UTC (rev 23092)
+++ trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/pom.xml	2010-06-29 18:22:08 UTC (rev 23093)
@@ -7,8 +7,12 @@
 	  <artifactId>org.jboss.tools.parent.pom</artifactId>
 	  <version>0.0.1-SNAPSHOT</version>
 	</parent>
-	<groupId>org.jboss.tools</groupId>
+	<groupId>org.jboss.tools.freemarker.tests</groupId>
 	<artifactId>org.jboss.ide.eclipse.freemarker.test</artifactId> 
 	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
+		<properties>
+		<emma.filter>org.jboss.ide.eclipse.freemarker.editor*</emma.filter>
+		<emma.instrument.bundles>org.jboss.ide.eclipse.freemarker</emma.instrument.bundles>
+	</properties>
 </project>

Modified: trunk/freemarker/tests/pom.xml
===================================================================
--- trunk/freemarker/tests/pom.xml	2010-06-29 16:57:48 UTC (rev 23092)
+++ trunk/freemarker/tests/pom.xml	2010-06-29 18:22:08 UTC (rev 23093)
@@ -1,18 +1,13 @@
 <project
 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<modelVersion>4.0.0</modelVersion>
-	<parent>
-	  <relativePath>../../parent-pom.xml</relativePath>
-	  <groupId>org.jboss.tools</groupId>
-	  <artifactId>org.jboss.tools.parent.pom</artifactId>
-	  <version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<groupId>org.jboss.tools</groupId>
-	<artifactId>freemarker.tests</artifactId>
+	<groupId>org.jboss.tools.freemarker</groupId>
+	<artifactId>tests</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<packaging>pom</packaging>
+	<name>freemarker.tests</name>
 	<modules>
 		<module>org.jboss.ide.eclipse.freemarker.test</module>
 	</modules>
 </project>
-	
\ No newline at end of file
+	

Modified: trunk/parent-pom.xml
===================================================================
--- trunk/parent-pom.xml	2010-06-29 16:57:48 UTC (rev 23092)
+++ trunk/parent-pom.xml	2010-06-29 18:22:08 UTC (rev 23093)
@@ -496,8 +496,19 @@
 							</execution>
 						</executions>
 					</plugin-->
-	
 					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-install-plugin</artifactId>
+						<version>2.3.1</version>
+						<configuration>
+							<file></file>
+							<groupId></groupId>
+							<artifactId></artifactId>
+							<version></version>
+							<packaging></packaging>
+						</configuration>
+					</plugin>
+					<plugin>
 						<groupId>org.sonatype.tycho</groupId>
 						<artifactId>maven-osgi-test-plugin</artifactId>
 						<version>${tychoVersion}</version>
@@ -527,6 +538,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-antrun-plugin</artifactId>
+						<version>1.3</version>
 						<dependencies>
 							<dependency>
 								<groupId>emma</groupId>

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2010-06-29 16:57:48 UTC (rev 23092)
+++ trunk/pom.xml	2010-06-29 18:22:08 UTC (rev 23093)
@@ -1,28 +1,13 @@
 <project
 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<modelVersion>4.0.0</modelVersion>
-<parent>
-	<relativePath>parent-pom.xml</relativePath>
-	<groupId>org.jboss.tools</groupId>
-	<artifactId>org.jboss.tools.parent.pom</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
-</parent>
-<groupId>org.jboss.tools</groupId>
-<artifactId>trunk</artifactId>
+<groupId>org.jboss</groupId>
+<artifactId>tools</artifactId>
 <version>0.0.1-SNAPSHOT</version>
 <packaging>pom</packaging>
 <modules>
-	<!-- OLD order: <module>tests</module> <module>common</module> <module>flow</module> 
-		<module>jbpm</module> <module>jmx</module> <module>archives</module> <module>as</module> 
-		<module>bpel</module> <module>smooks</module> <module>freemarker</module> 
-		<module>profiler</module> <module>portlet</module> <module>modeshape</module> 
-		<module>xulrunner</module> <module>jst</module> <module>vpe</module> <module>jsf</module> 
-		<module>drools</module> <module>esb</module> <module>tptp</module> <module>ws</module> 
-		<module>cdi</module> <module>struts</module> <module>hibernatetools</module> 
-		<module>seam</module> <module>examples</module> <module>birt</module> <module>maven</module> 
-		<module>site</module> -->
-
 	<module>build/target-platform</module>
+	<module>build/libs</module>
 
 	<!-- this order is important! make sure you've run genpom.xml first! -->
 	<!-- dgolovin's order -->
@@ -59,7 +44,7 @@
 	<module>jbpm</module>
 	<!-- NOTE: To build drools, must first bootstrap with ant script: cd drools; 
 		ant -q -->
-	<module>drools</module>
+	<!--module>drools</module-->
 	
 	<module>site</module>
 </modules>



More information about the jbosstools-commits mailing list