[jboss-svn-commits] JBL Code SVN: r36218 - in labs/jbossrules/trunk: drools-camel and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Dec 6 09:37:38 EST 2010
Author: ge0ffrey
Date: 2010-12-06 09:37:37 -0500 (Mon, 06 Dec 2010)
New Revision: 36218
Removed:
labs/jbossrules/trunk/drools-guvnor/soa-specific.xml
Modified:
labs/jbossrules/trunk/README.txt
labs/jbossrules/trunk/drools-camel/pom.xml
labs/jbossrules/trunk/drools-compiler/pom.xml
labs/jbossrules/trunk/drools-core/pom.xml
labs/jbossrules/trunk/drools-docs/pom.xml
labs/jbossrules/trunk/drools-guvnor/pom.xml
labs/jbossrules/trunk/pom.xml
Log:
JBRULES-2815 soa profile + remove soa-specific.xml as soa guys don't use it
Modified: labs/jbossrules/trunk/README.txt
===================================================================
--- labs/jbossrules/trunk/README.txt 2010-12-06 14:13:17 UTC (rev 36217)
+++ labs/jbossrules/trunk/README.txt 2010-12-06 14:37:37 UTC (rev 36218)
@@ -43,16 +43,16 @@
Run the build
$ mvn -DskipTests clean install
-Or better yet, run the full build (so with the profile "full")
-$ mvn -Pfull -DskipTests clean install
+Or better yet, run the full build (this actives the profile "fullProfile")
+$ mvn -Dfull -DskipTests clean install
The first build will take a long time, because a lot of dependencies will be downloaded (and cached locally).
It might even fail, if certain servers are offline or experience hiccups.
In that case, you 'll see an IO error and just run the build again.
After the first successful build, any next build should be fast and stable.
-There are 3 profiles:
-- default (no profile): Fast, for during development
+There are 3 profile activation properties:
+- <default>: Fast, for during development
- full: Slow, but builds everything (including eclipse plugins and documentation). Used by hudson and during releases.
- soa: prunes away the non-enterprise stuff
@@ -60,8 +60,8 @@
=========
To produce distribution builds use:
-$ mvn -Pfull clean install
-$ mvn -Pfull -DskipTests package javadoc:javadoc assembly:assembly
+$ mvn -Dfull clean install
+$ mvn -Dfull -DskipTests package javadoc:javadoc assembly:assembly
Note that install must be done first as javadoc:javadoc won't work unless the
jars are in the local maven repo, but the tests can be skipped on the second run.
@@ -86,7 +86,7 @@
The maven-eclipse-plugin plugin is a plugin in Maven for Eclipse.
This is the old, stable way.
Run this command to generate .project and .classpath files.
-$ mvn -Pfull eclipse:eclipse
+$ mvn -Dfull eclipse:eclipse
- Open Eclipse
- Import existing projects, navigate to the project base directory, select all the projects (=modules) it lists.
@@ -97,7 +97,7 @@
This is the new, deluxe way.
- Open Eclipse
- Just open the main pom.xml with the m2eclipse plugin.
-- Select the profile "full".
+- Select the profiles "notSoaProfile" and "fullProfile".
Code style
----------
@@ -169,7 +169,7 @@
- Open IntelliJ.
- Open new project.
- Open the main pom.xml file from the project base directory.
-- Select profile "full".
+- Select the profiles "notSoaProfile" and "fullProfile".
- Go grab a coffee while it's indexing.
Code style
Modified: labs/jbossrules/trunk/drools-camel/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-camel/pom.xml 2010-12-06 14:13:17 UTC (rev 36217)
+++ labs/jbossrules/trunk/drools-camel/pom.xml 2010-12-06 14:37:37 UTC (rev 36218)
@@ -18,8 +18,8 @@
<url>https://repository.apache.org/content/repositories/snapshots/</url>
</repository>
</repositories>
+
<dependencies>
-
<!-- Drools -->
<dependency>
<groupId>org.drools</groupId>
Modified: labs/jbossrules/trunk/drools-compiler/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-compiler/pom.xml 2010-12-06 14:13:17 UTC (rev 36217)
+++ labs/jbossrules/trunk/drools-compiler/pom.xml 2010-12-06 14:37:37 UTC (rev 36218)
@@ -110,7 +110,7 @@
</dependencies>
<profiles>
<profile>
- <id>grammars</id>
+ <id>grammarsProfile</id>
<activation>
<property>
<name>grammars</name>
Modified: labs/jbossrules/trunk/drools-core/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-core/pom.xml 2010-12-06 14:13:17 UTC (rev 36217)
+++ labs/jbossrules/trunk/drools-core/pom.xml 2010-12-06 14:37:37 UTC (rev 36218)
@@ -80,7 +80,7 @@
<profiles>
<profile>
- <id>grammars</id>
+ <id>grammarsProfile</id>
<activation>
<property>
<name>grammars</name>
Modified: labs/jbossrules/trunk/drools-docs/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-docs/pom.xml 2010-12-06 14:13:17 UTC (rev 36217)
+++ labs/jbossrules/trunk/drools-docs/pom.xml 2010-12-06 14:37:37 UTC (rev 36218)
@@ -14,15 +14,30 @@
<name>Drools :: Documentation</name>
<modules>
+ <!-- These are just the soa modules -->
<module>drools-docs-introduction</module>
<module>drools-docs-expert</module>
<module>drools-docs-flow</module>
<module>drools-docs-fusion</module>
<module>drools-docs-guvnor</module>
- <module>drools-docs-planner</module>
- <module>drools-docs-integration</module>
+ <!-- Other modules are defined in the not-soa profile -->
</modules>
+ <profiles>
+ <profile>
+ <id>notSoaProfile</id>
+ <activation>
+ <property>
+ <name>!soa</name>
+ </property>
+ </activation>
+ <modules>
+ <module>drools-docs-planner</module>
+ <module>drools-docs-integration</module>
+ </modules>
+ </profile>
+ </profiles>
+
<dependencyManagement>
<dependencies>
<dependency>
@@ -70,27 +85,6 @@
</dependencies>
</dependencyManagement>
- <profiles>
- <profile>
- <id>soa</id>
- <activation>
- <property>
- <name>soa</name>
- </property>
- </activation>
- <modules>
- <module>drools-docs-introduction</module>
- <module>drools-docs-expert</module>
- <module>drools-docs-flow</module>
- <module>drools-docs-fusion</module>
- <module>drools-docs-guvnor</module>
- <!--module>drools-docs-planner</module-->
- <!--module>drools-docs-integration</module-->
- </modules>
- </profile>
- </profiles>
-
-
<build>
<plugins>
<plugin>
Modified: labs/jbossrules/trunk/drools-guvnor/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/pom.xml 2010-12-06 14:13:17 UTC (rev 36217)
+++ labs/jbossrules/trunk/drools-guvnor/pom.xml 2010-12-06 14:37:37 UTC (rev 36218)
@@ -96,10 +96,15 @@
</build>
<profiles>
<profile>
- <id>full</id>
+ <id>fullProfile</id>
+ <activation>
+ <property>
+ <name>full</name>
+ </property>
+ </activation>
<build>
<plugins>
- <plugin>
+ <plugin><!-- Keep in sync with soa profile -->
<groupId>org.codehaus.mojo</groupId>
<artifactId>gwt-maven-plugin</artifactId>
<configuration>
@@ -113,16 +118,15 @@
</build>
</profile>
<profile>
- <id>soa</id>
+ <id>soaProfile</id>
<activation>
<property>
<name>soa</name>
</property>
</activation>
<build>
- <finalName>drools-guvnor</finalName>
<plugins>
- <plugin>
+ <plugin><!-- Keep in sync with full profile -->
<groupId>org.codehaus.mojo</groupId>
<artifactId>gwt-maven-plugin</artifactId>
<configuration>
@@ -132,51 +136,11 @@
<draftCompile>false</draftCompile>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>soa_overlay</id>
- <phase>package</phase>
- <configuration>
- <tasks>
- <ant antfile="${basedir}/soa-specific.xml" target="soa_overlay"></ant>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <webResources><!-- TODO verify that it's needed to repeat this from the normal war configuration -->
- <resource>
- <directory>${basedir}/src/main/webapp</directory>
- </resource>
- <resource>
- <directory>${basedir}/src/main/filtered-webapp</directory>
- <filtering>true</filtering>
- </resource>
- </webResources>
- </configuration>
- <executions>
- <execution>
- <id>war-it</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>war</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</profile>
</profiles>
+
<dependencies>
<!-- Internal dependencies -->
<!-- first the deps for the repo API itself (Jackrabbit based) -->
Deleted: labs/jbossrules/trunk/drools-guvnor/soa-specific.xml
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/soa-specific.xml 2010-12-06 14:13:17 UTC (rev 36217)
+++ labs/jbossrules/trunk/drools-guvnor/soa-specific.xml 2010-12-06 14:37:37 UTC (rev 36218)
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<project name="Drools" basedir="." default="soa_overlay">
-
- <target name="soa_overlay" description="SOA specific build">
- <echo>Executing soa_overlay ...</echo>
- <replace file="target/drools-guvnor/WEB-INF/components.xml" >
- <replacetoken>security:identity authenticate-method="#{defaultAuthenticator.authenticate}"</replacetoken>
- <replacevalue>security:identity authenticate-method="#{authenticator.authenticate}" jaas-config-name="jmx-console"</replacevalue>
- </replace>
-
- <replace dir="target/drools-guvnor/org.drools.guvnor.Guvnor" >
- <include name="*.html" />
- <replacefilter token="JBoss Guvnor" value="JBoss BRMS" />
- <replacefilter token="Welcome to Guvnor" value="Welcome to BRMS" />
- <replacefilter token="Guvnor specific permissions as needed." value="BRMS specific permissions as needed." />
- <replacefilter token="Bienvenidos a Guvnor" value="Bienvenidos a BRMS" />
- <replacefilter token="Guvnor segun sus necesidades." value="BRMS segun sus necesidades." />
- </replace>
- <copy file="target/drools-guvnor/org.drools.guvnor.Guvnor/hdrlogo_brms.gif" tofile="target/drools-guvnor/org.drools.guvnor.Guvnor/header_logo.gif" overwrite="true"/>
- </target>
-</project>
Modified: labs/jbossrules/trunk/pom.xml
===================================================================
--- labs/jbossrules/trunk/pom.xml 2010-12-06 14:13:17 UTC (rev 36217)
+++ labs/jbossrules/trunk/pom.xml 2010-12-06 14:37:37 UTC (rev 36218)
@@ -261,8 +261,8 @@
</pluginRepository>
</pluginRepositories>
- <!-- default modules -->
<modules>
+ <!-- These are just the soa modules -->
<module>drools-ant</module>
<module>drools-api</module>
<module>drools-camel</module>
@@ -284,11 +284,12 @@
<module>drools-server</module>
<module>drools-templates</module>
<module>drools-verifier</module>
+ <!-- Other modules are defined in the not-soa profile -->
</modules>
<profiles>
<profile>
- <id>default</id>
+ <id>notSoaProfile</id>
<activation>
<property>
<name>!soa</name>
@@ -333,7 +334,12 @@
</profile>
<profile>
- <id>full</id>
+ <id>fullProfile</id>
+ <activation>
+ <property>
+ <name>full</name>
+ </property>
+ </activation>
<modules>
<module>drools-docs</module>
<module>drools-examples</module>
@@ -342,7 +348,7 @@
</profile>
<profile>
- <id>soa</id>
+ <id>soaProfile</id>
<activation>
<property>
<name>soa</name>
More information about the jboss-svn-commits
mailing list