[jboss-svn-commits] JBL Code SVN: r35432 - in labs/jbossrules/soa_branches/BRMS-5.1.1: drools-guvnor and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Oct 5 11:03:15 EDT 2010
Author: zzoubkov at redhat.com
Date: 2010-10-05 11:03:14 -0400 (Tue, 05 Oct 2010)
New Revision: 35432
Removed:
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/.gwt-tmp/
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/webapp/.gwt-tmp/
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/webapp/NOTE.txt
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/webapp/org.drools.guvnor.Guvnor/
labs/jbossrules/soa_branches/BRMS-5.1.1/lib/cobogw-1.0.jar
labs/jbossrules/soa_branches/BRMS-5.1.1/lib/gwt-diagrams-0.1.jar
labs/jbossrules/soa_branches/BRMS-5.1.1/lib/gwtext-2.0.1.jar
labs/jbossrules/soa_branches/BRMS-5.1.1/lib/gwtext.jar
labs/jbossrules/soa_branches/BRMS-5.1.1/lib/gwttasks.jar
Modified:
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/.ant-targets-build.xml
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/build.properties
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/build.xml
labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/pom.xml
labs/jbossrules/soa_branches/BRMS-5.1.1/pom.xml
Log:
Changes from Geoffrey's patch (JBRULES-2705, commit 35421)
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/.ant-targets-build.xml
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/.ant-targets-build.xml 2010-10-05 12:27:43 UTC (rev 35431)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/.ant-targets-build.xml 2010-10-05 15:03:14 UTC (rev 35432)
@@ -1,4 +1,2 @@
guvnor-standalone
-gwt-compile
-gwt-shell
plug-editors
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/build.properties
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/build.properties 2010-10-05 12:27:43 UTC (rev 35431)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/build.properties 2010-10-05 15:03:14 UTC (rev 35432)
@@ -1,4 +1,2 @@
-#this is needed to point to your version of GWT
-gwt.home=/users/rikkola/Codes/lib/gwt-2.0.4
jbossAS.version=jboss-4.2.3.GA
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/build.xml
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/build.xml 2010-10-05 12:27:43 UTC (rev 35431)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/build.xml 2010-10-05 15:03:14 UTC (rev 35432)
@@ -2,85 +2,14 @@
<!--
- This is a module specific script for GWT related issues mainly you should only need to worry about this
- if you are modifying the GUI itself.
-
@author Michael Neale
-->
-<project name="org.drools.guvnor.Guvnor" default="gwt-compile" basedir="." xmlns:gwt="antlib:de.samaflost.gwttasks">
- <taskdef uri="antlib:de.samaflost.gwttasks"
- resource="de/samaflost/gwttasks/antlib.xml"
- classpath="../lib/gwttasks.jar"/>
-
-
+<project name="org.drools.guvnor.Guvnor" basedir=".">
<property file="build.properties"/>
- <property name="jbossAS.tempdir" location="tempdir" />
+ <property name="jbossAS.tempdir" location="target/guvnor-standalone"/>
-
-<property name="src.dir" value="src/main/java" />
-<property name="build.dir" value="target/drools-guvnor/" />
-
-<path id="compile.classpath">
- <fileset dir="${build.dir}/WEB-INF/lib">
- <include name="**/*.jar" />
- <include name="**/*.xml" />
- </fileset>
- </path>
-
-<path id="gwt.classpath">
- <fileset dir="${gwt.home}">
- <include name="*.jar" />
- <include name="*.xml" />
- </fileset>
- </path>
-
-
-<target name="gwt-compile" description="GWT compile to JavaScript">
- <java failonerror="true" fork="true" classname="com.google.gwt.dev.Compiler">
- <classpath>
- <path refid="gwt.classpath" />
- <pathelement location="${src.dir}" />
- <pathelement location="../drools-ide-common/src/main/java" />
- <pathelement location="../drools-ide-common/src/main/resources" />
- <pathelement location="../lib/cobogw-1.0.jar" />
- <pathelement location="../lib/gwt-diagrams-0.1.jar" />
- <pathelement location="../drools-factconstraint/src/main/java" />
- <pathelement location="../lib/gwtext.jar" />
- <pathelement location="../drools-factconstraint/src/main/resources" />
- <!--pathelement location="" /-->
- <path refid="compile.classpath" />
- </classpath>
- <jvmarg value="-Xmx256M" />
- <arg value="org.drools.guvnor.Guvnor" />
- </java>
-
- <delete>
- <fileset dir="src/main/webapp/org.drools.guvnor.Guvnor" includes="*.gwt.rpc *.cache.html *.cache.js *.cache.xml *.cache.png"/>
- </delete>
- <copy todir="src/main/webapp">
- <fileset dir="war">
- <include name="**/*" />
- </fileset>
- </copy>
- <delete>
- <fileset dir="war"/>
- </delete>
- </target>
-
-
-
-
-
-
-
-
-
-
-
-
-
<!-- Creates a stand alone zip. JBoss AS + Guvnor -->
<target name="guvnor-standalone" >
@@ -98,7 +27,7 @@
<unzip src="target/drools-guvnor.war"
dest="${jbossAS.tempdir}/${jbossAS.version}/server/default/deploy/drools-guvnor.war" />
<zip basedir="${jbossAS.tempdir}"
- destfile="guvnor-standalone.zip" />
+ destfile="target/guvnor-standalone.zip" />
<delete dir="${jbossAS.tempdir}" />
<antcall target="remove-jboss-as"/>
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/pom.xml
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/pom.xml 2010-10-05 12:27:43 UTC (rev 35431)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/pom.xml 2010-10-05 15:03:14 UTC (rev 35432)
@@ -23,6 +23,29 @@
<build>
<finalName>drools-guvnor</finalName>
<plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>gwt-maven-plugin</artifactId>
+ <version>2.1-20101001.MGWT219</version>
+ <configuration>
+ <module>org.drools.guvnor.Guvnor</module>
+ <runTarget>org.drools.guvnor.Guvnor/Guvnor.html</runTarget>
+ <draftCompile>false</draftCompile><!-- Trunk will set this correclty with a production profile -->
+ <compileSourcesArtifacts>
+ <compileSourcesArtifact>org.drools:drools-factconstraint</compileSourcesArtifact>
+ <compileSourcesArtifact>org.drools:drools-ide-common</compileSourcesArtifact>
+ </compileSourcesArtifacts>
+ <localWorkers>2</localWorkers><!-- Using all workers can temporarily hang te mouse and isn't much faster -->
+ <extraJvmArgs>-Xmx512m</extraJvmArgs>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
@@ -118,6 +141,11 @@
<groupId>com.google.gwt</groupId>
<artifactId>gwt-servlet</artifactId>
</dependency>
+ <dependency><!-- Not needed at runtime, only at compile time, should be a dependency on gwt-maven-plugin -->
+ <groupId>com.google.gwt</groupId>
+ <artifactId>gwt-user</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>com.gwtext</groupId>
<artifactId>gwtext</artifactId>
Deleted: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/webapp/NOTE.txt
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/webapp/NOTE.txt 2010-10-05 12:27:43 UTC (rev 35431)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/webapp/NOTE.txt 2010-10-05 15:03:14 UTC (rev 35432)
@@ -1,2 +0,0 @@
-The org.drools.guvnor... is GENERATED by GWT. DO NOT edit this by hand,
-ever, or it will be replaced at some point in the future.
\ No newline at end of file
Deleted: labs/jbossrules/soa_branches/BRMS-5.1.1/lib/cobogw-1.0.jar
===================================================================
(Binary files differ)
Deleted: labs/jbossrules/soa_branches/BRMS-5.1.1/lib/gwt-diagrams-0.1.jar
===================================================================
(Binary files differ)
Deleted: labs/jbossrules/soa_branches/BRMS-5.1.1/lib/gwtext-2.0.1.jar
===================================================================
(Binary files differ)
Deleted: labs/jbossrules/soa_branches/BRMS-5.1.1/lib/gwtext.jar
===================================================================
(Binary files differ)
Deleted: labs/jbossrules/soa_branches/BRMS-5.1.1/lib/gwttasks.jar
===================================================================
(Binary files differ)
Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/pom.xml
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/pom.xml 2010-10-05 12:27:43 UTC (rev 35431)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/pom.xml 2010-10-05 15:03:14 UTC (rev 35432)
@@ -15,7 +15,7 @@
<camel-version>2.4.0</camel-version>
<cxf-version>2.2.9</cxf-version>
<springframework-version>2.5.6</springframework-version>
-
+ <gwt.version>2.0.4</gwt.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<prerequisites>
@@ -968,6 +968,7 @@
<dependency>
<groupId>org.drools</groupId>
<artifactId>drools-guvnor</artifactId>
+ <type>war</type>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -1310,9 +1311,19 @@
<dependency>
<groupId>com.google.gwt</groupId>
<artifactId>gwt-servlet</artifactId>
- <version>2.0.4</version>
+ <version>${gwt.version}</version>
</dependency>
<dependency>
+ <groupId>com.google.gwt</groupId>
+ <artifactId>gwt-user</artifactId>
+ <version>${gwt.version}</version>
+ </dependency>
+ <dependency><!-- Only use for a plugin dependency, not as a normal dependency -->
+ <groupId>com.google.gwt</groupId>
+ <artifactId>gwt-dev</artifactId>
+ <version>${gwt.version}</version>
+ </dependency>
+ <dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>1.2.1</version>
More information about the jboss-svn-commits
mailing list