Menu
▾
▴
jboss-svn-commits — JBoss SVN commit notifications
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(233) |
Sep
(199) |
Oct
(206) |
Nov
(185) |
Dec
(270) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(232) |
Feb
(426) |
Mar
(623) |
Apr
(592) |
May
(506) |
Jun
(389) |
Jul
(160) |
Aug
(3) |
Sep
(1) |
Oct
(1) |
Nov
(2) |
Dec
(5) |
| 2007 |
Jan
(1) |
Feb
(1) |
Mar
(2) |
Apr
(2) |
May
(4) |
Jun
(2) |
Jul
|
Aug
(3) |
Sep
(5) |
Oct
(9) |
Nov
(6) |
Dec
(6) |
| 2008 |
Jan
(3) |
Feb
|
Mar
(1) |
Apr
(3) |
May
(3) |
Jun
(5) |
Jul
(10) |
Aug
(2) |
Sep
(12) |
Oct
(10) |
Nov
(54) |
Dec
(49) |
| 2009 |
Jan
(19) |
Feb
(13) |
Mar
(20) |
Apr
(24) |
May
(44) |
Jun
(29) |
Jul
(32) |
Aug
(10) |
Sep
(7) |
Oct
(10) |
Nov
(4) |
Dec
(17) |
| 2010 |
Jan
(14) |
Feb
(5) |
Mar
(23) |
Apr
(50) |
May
(31) |
Jun
(9) |
Jul
(5) |
Aug
(4) |
Sep
(7) |
Oct
(5) |
Nov
(2) |
Dec
(3) |
| 2011 |
Jan
(12) |
Feb
(5) |
Mar
(5) |
Apr
(3) |
May
(4) |
Jun
(3) |
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2012 |
Jan
(1) |
Feb
(2) |
Mar
|
Apr
(1) |
May
(1) |
Jun
(2) |
Jul
(4) |
Aug
(1) |
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(2) |
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(3) |
Sep
|
Oct
|
Nov
|
Dec
(1) |
| 2015 |
Jan
|
Feb
|
Mar
(2) |
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <jbo...@li...> - 2006-05-17 06:57:19
|
Author: mla...@jb...
Date: 2006-05-17 02:57:16 -0400 (Wed, 17 May 2006)
New Revision: 4278
Modified:
labs/jbossweb/trunk/build.xml
Log:
Make sure all bin/*.sh files have execute permission.
Modified: labs/jbossweb/trunk/build.xml
===================================================================
--- labs/jbossweb/trunk/build.xml 2006-05-17 06:56:32 UTC (rev 4277)
+++ labs/jbossweb/trunk/build.xml 2006-05-17 06:57:16 UTC (rev 4278)
@@ -252,6 +252,7 @@
<include name="**.*"/>
</fileset>
</copy>
+ <chmod dir="${jbossweb.build}/${final.name}/bin" includes="*.sh" perm="+x"/>
<!-- JBoss Web Main -->
<jar jarfile="${jbossweb.build}/${final.name}/server/default/deploy/jbossweb.sar/jbossweb.jar" index="true">
|
|
From: <jbo...@li...> - 2006-05-17 06:56:36
|
Author: mla...@jb... Date: 2006-05-17 02:56:32 -0400 (Wed, 17 May 2006) New Revision: 4277 Modified: labs/jbossweb/trunk/build.properties.default Log: Create version 1.0.0.CR1 Modified: labs/jbossweb/trunk/build.properties.default =================================================================== --- labs/jbossweb/trunk/build.properties.default 2006-05-17 06:37:45 UTC (rev 4276) +++ labs/jbossweb/trunk/build.properties.default 2006-05-17 06:56:32 UTC (rev 4277) @@ -12,7 +12,7 @@ # ----- Vesion Control Flags ----- version.major=1 version.minor=0 -version.build=1 +version.build=0 version.patch=CR1 # ----- Vesion Control Flags ----- |
|
From: <jbo...@li...> - 2006-05-17 06:37:49
|
Author: mla...@jb... Date: 2006-05-17 02:37:45 -0400 (Wed, 17 May 2006) New Revision: 4276 Modified: labs/jbossweb/trunk/src/share/native/build/buildphp.sh Log: Add SVN eol-style:native Property changes on: labs/jbossweb/trunk/src/share/native/build/buildphp.sh ___________________________________________________________________ Name: svn:eol-style + native |
|
From: <jbo...@li...> - 2006-05-17 06:37:03
|
Author: mla...@jb... Date: 2006-05-17 02:36:58 -0400 (Wed, 17 May 2006) New Revision: 4275 Modified: labs/jbossweb/trunk/src/share/native/build/buildphp.sh Log: Add SVN executable flag. Property changes on: labs/jbossweb/trunk/src/share/native/build/buildphp.sh ___________________________________________________________________ Name: svn:executable + * |
|
From: <jbo...@li...> - 2006-05-17 06:32:04
|
Author: mic...@jb...
Date: 2006-05-17 02:24:36 -0400 (Wed, 17 May 2006)
New Revision: 4274
Added:
labs/jbossrules/updates/drools-ide-update/features/org.drools.ide_1.0.2.jar
Removed:
labs/jbossrules/updates/drools-ide-update/features/org.drools.ide_1.0.0.jar
Modified:
labs/jbossrules/updates/drools-ide-update/plugins/org.drools.ide_1.0.0.jar
labs/jbossrules/updates/drools-ide-update/site.xml
Log:
RC3
Deleted: labs/jbossrules/updates/drools-ide-update/features/org.drools.ide_1.0.0.jar
===================================================================
(Binary files differ)
Added: labs/jbossrules/updates/drools-ide-update/features/org.drools.ide_1.0.2.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossrules/updates/drools-ide-update/features/org.drools.ide_1.0.2.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: labs/jbossrules/updates/drools-ide-update/plugins/org.drools.ide_1.0.0.jar
===================================================================
(Binary files differ)
Modified: labs/jbossrules/updates/drools-ide-update/site.xml
===================================================================
--- labs/jbossrules/updates/drools-ide-update/site.xml 2006-05-17 05:53:52 UTC (rev 4273)
+++ labs/jbossrules/updates/drools-ide-update/site.xml 2006-05-17 06:24:36 UTC (rev 4274)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
- <feature url="features/org.drools.ide_1.0.0.jar" id="org.drools.ide" version="1.0.0">
+ <feature url="features/org.drools.ide_1.0.2.jar" id="org.drools.ide" version="1.0.2">
<category name="JBossRules"/>
</feature>
<category-def name="JBossRules" label="JBoss Rules"/>
|
|
From: <jbo...@li...> - 2006-05-17 05:53:56
|
Author: mla...@jb...
Date: 2006-05-17 01:53:52 -0400 (Wed, 17 May 2006)
New Revision: 4273
Modified:
labs/jbossweb/trunk/src/share/classes/org/apache/catalina/util/ServerInfo.java
labs/jbossweb/trunk/src/share/classes/org/apache/catalina/util/ServerInfo.properties
Log:
Use JBoss Web Server as a product name.
Modified: labs/jbossweb/trunk/src/share/classes/org/apache/catalina/util/ServerInfo.java
===================================================================
--- labs/jbossweb/trunk/src/share/classes/org/apache/catalina/util/ServerInfo.java 2006-05-17 05:53:05 UTC (rev 4272)
+++ labs/jbossweb/trunk/src/share/classes/org/apache/catalina/util/ServerInfo.java 2006-05-17 05:53:52 UTC (rev 4273)
@@ -39,12 +39,12 @@
/**
* The server information String with which we identify ourselves.
*/
- private static String serverInfo = "JBoss Web";
+ private static String serverInfo = "JBoss Web Server";
/**
* The server information String with which we identify ourselves.
*/
- private static String escapedServerInfo = "JBoss-Web";
+ private static String escapedServerInfo = "JBoss-Web-Server";
/**
* The server built String.
@@ -54,7 +54,7 @@
/**
* The server's version number String.
*/
- private static String serverNumber = "4.0.0";
+ private static String serverNumber = "1.0.0";
static {
Modified: labs/jbossweb/trunk/src/share/classes/org/apache/catalina/util/ServerInfo.properties
===================================================================
--- labs/jbossweb/trunk/src/share/classes/org/apache/catalina/util/ServerInfo.properties 2006-05-17 05:53:05 UTC (rev 4272)
+++ labs/jbossweb/trunk/src/share/classes/org/apache/catalina/util/ServerInfo.properties 2006-05-17 05:53:52 UTC (rev 4273)
@@ -1,3 +1,3 @@
-server.info=JBoss Web/@VERSION@
+server.info=JBoss Web Server/@VERSION@
server.number=@VERSION_NUMBER@
server.built=@VERSION_BUILT@
\ No newline at end of file
|
|
From: <jbo...@li...> - 2006-05-17 05:53:09
|
Author: mla...@jb...
Date: 2006-05-17 01:53:05 -0400 (Wed, 17 May 2006)
New Revision: 4272
Modified:
labs/jbossweb/trunk/build.xml
Log:
Exclude ROOT.war from deployment task. We have our own ROOT.war.
Modified: labs/jbossweb/trunk/build.xml
===================================================================
--- labs/jbossweb/trunk/build.xml 2006-05-17 05:52:25 UTC (rev 4271)
+++ labs/jbossweb/trunk/build.xml 2006-05-17 05:53:05 UTC (rev 4272)
@@ -187,6 +187,7 @@
<exclude name="server.xml" />
<exclude name="conf/**" />
+ <exclude name="ROOT.war/**" />
</fileset>
|
|
From: <jbo...@li...> - 2006-05-17 05:52:29
|
Author: mla...@jb... Date: 2006-05-17 01:52:25 -0400 (Wed, 17 May 2006) New Revision: 4271 Modified: labs/jbossweb/trunk/build.properties.default Log: Rename version to 1.0.0 and use JBoss AS 4.0.4 GA Modified: labs/jbossweb/trunk/build.properties.default =================================================================== --- labs/jbossweb/trunk/build.properties.default 2006-05-17 04:38:15 UTC (rev 4270) +++ labs/jbossweb/trunk/build.properties.default 2006-05-17 05:52:25 UTC (rev 4271) @@ -10,16 +10,16 @@ # ----------------------------------------------------------------------------- # ----- Vesion Control Flags ----- -version.major=4 +version.major=1 version.minor=0 -version.build=4 -version.patch=CR2 +version.build=1 +version.patch=CR1 # ----- Vesion Control Flags ----- jboss.version.major=4 jboss.version.minor=0 jboss.version.build=4 -jboss.version.patch=CR2 +jboss.version.patch=GA # ----- Compile Control Flags ----- compile.debug=on |
|
From: <jbo...@li...> - 2006-05-17 04:38:27
|
Author: mic...@jb...
Date: 2006-05-17 00:38:15 -0400 (Wed, 17 May 2006)
New Revision: 4270
Modified:
labs/jbossrules/trunk/documentation/manual/en/Chapter-Install/Section-Eclipse.xml
labs/jbossrules/trunk/documentation/manual/en/Chapter-Install/Section-Maven_build.xml
labs/jbossrules/trunk/documentation/manual/en/Chapter-Install/Section-Setup.xml
labs/jbossrules/trunk/documentation/training/developers-course/course_outline.odt
Log:
doco for ANT
Modified: labs/jbossrules/trunk/documentation/manual/en/Chapter-Install/Section-Eclipse.xml
===================================================================
--- labs/jbossrules/trunk/documentation/manual/en/Chapter-Install/Section-Eclipse.xml 2006-05-17 03:50:06 UTC (rev 4269)
+++ labs/jbossrules/trunk/documentation/manual/en/Chapter-Install/Section-Eclipse.xml 2006-05-17 04:38:15 UTC (rev 4270)
@@ -5,6 +5,11 @@
<section>
<title>Generating Eclipse Projects</title>
+ <para>
+ The drools project has eclipse projects checked in for convenience. However, these are originally generated by maven 2.
+ If you have maven 2 installed, you can also regenerate the eclipse projects automatically, or even generate it for IntelliJ etc, see the instructions below for this (most people can ignore this section)
+ </para>
+
<para><indexterm>
<primary>maven</primary>
</indexterm>Maven is able to generate standard <indexterm>
Modified: labs/jbossrules/trunk/documentation/manual/en/Chapter-Install/Section-Maven_build.xml
===================================================================
--- labs/jbossrules/trunk/documentation/manual/en/Chapter-Install/Section-Maven_build.xml 2006-05-17 03:50:06 UTC (rev 4269)
+++ labs/jbossrules/trunk/documentation/manual/en/Chapter-Install/Section-Maven_build.xml 2006-05-17 04:38:15 UTC (rev 4270)
@@ -7,61 +7,100 @@
<para>Now that we have the source the next step is to build and install
the source. We do this with <indexterm>
- <primary>maven</primary>
- </indexterm>Maven 2, which will also handle the downloading of required
- dependencies.</para>
+ <primary>Ant</primary>
+ </indexterm>Ant, which uses maven 2 under the covers to get the needed
+ dependencies (you don't need to have maven 2 installed to build). Note
+ that the plug in is build seperatly, but the build process will update the
+ plug ins dependencies (refer to the section on building the plug in if you
+ need to build a new version of the plug in).</para>
- <para>Type <literal>'mvn install' </literal>to start the build process.
- Maven will then build and each Drools module - <indexterm>
- <primary>drools-core</primary>
- </indexterm>drools-core, <indexterm>
- <primary>drools-compiler</primary>
- </indexterm>drools-compiler, <indexterm>
- <primary>drools-jsr94</primary>
- </indexterm>drools-jsr94. During this process it will run the <indexterm>
- <primary>unit test</primary>
- </indexterm>Unit Tests for each module. Maven is not yet able to build
- <indexterm>
- <primary>eclipse</primary>
- </indexterm>Eclipse plugins, so this module is not included, instead the
- project for the <indexterm>
- <primary>drools-ide</primary>
- </indexterm>drools-ide module is already added to subversion.</para>
+ <para>Type <literal>'ant' </literal>to get a listing of what capabilities
+ the build script has (from the root of the project). You should then see a
+ listing which contains further instructions: <programlisting>
+<literal>C:\Projects\jboss-rules-new>ant
+Buildfile: build.xml
- <screenshot>
- <screeninfo>Start Maven Install</screeninfo>
+help:
+ [echo] Drools Build Help
+ [echo] -----------------
+ [echo]
+ [echo] The build process is for the following four modules:
+ [echo] drools-core
+ [echo] drools-compiler
+ [echo] drools-decisiontables
+ [echo] drools-jsr94
+ [echo]
+ [echo] Further to this there are two Eclipse project:
+ [echo] drools-examples - To use open eclipse and import.
+ [echo] Requires the Drools eclipse plugin.
+ [echo] Either build the plugin from drools-ide
+ [echo] or install from the Eclipse update site
+ [echo] http://anonsvn.labs.jboss.com/labs/jbossrules/upda
+tes
+ [echo] drools-ide - To use open Eclipse and import.
+ [echo] Select export and plugin fragements to
+ [echo] generate the Drools Eclipse plugin
+ [echo] Depends on all the depencies being copied
+ [echo] to its lib directory at the end of build-all,
+ [echo] which calls copy-deps.
+ [echo]
+ [echo] Targets
+ [echo] -----
+ [echo]
+ [echo] clean-all - cleans all directories
+ [echo]
+ [echo] build-all - builds all modules
+ [echo]
+ [echo] javadocs - generates the javadoc at target/docs
+ [echo]
+ [echo] manual - generates the docbook documentation in
+ [echo] html and single_html format at target/docs
+ [echo]
+ [echo] dist-all - generates the distribution builds for
+ [echo] src, bin, bin-withdeps and examples
+ [echo]
+ [echo] Each module can individually be executed with clean, compile,
+ [echo] test and build. To use simply use the following commands,
+ [echo] replace ${module} with one of the module names:
+ [echo] clean-${module}
+ [echo] compile-${module}
+ [echo] test-${module}
+ [echo] build-${module}
+ [echo]
+ [echo] Generates specific distribution builds:
+ [echo] dist-src
+ [echo] dist-bin
+ [echo] dist-bin-withdeps
+ [echo] dist-examples
+ [echo]
+ [echo] You may also pass the following system properties:
+ [echo] -Dtest.skip=true
+ [echo] -Djavadocs.skip=true
+ [echo] -Dmanual.skip=true
+ [echo]
+ [echo] Targets may be combined:
+ [echo] ant -Dtest.skip clean-all build-all
+ [echo]
+ [echo] For more help use the build system to generate the manual
+ [echo] or you can find the manual online at:
+ [echo] http://labs.jboss.com/portal/jbossrules/docs/index.html
- <mediaobject>
- <imageobject>
- <imagedata fileref="mvn_install1.jpg" />
- </imageobject>
- </mediaobject>
- </screenshot>
+BUILD SUCCESSFUL
- <screenshot>
- <screeninfo>Maven Module Unit Testing</screeninfo>
+</literal>
+</programlisting></para>
- <mediaobject>
- <imageobject>
- <imagedata fileref="mvn_install2.jpg" />
- </imageobject>
- </mediaobject>
- </screenshot>
+ <para>The most common pair of tasks to run is 'ant clean-all build-all'
+ which will clear old artifacts, and then test and built the source, and
+ report on any errors.</para>
- <screenshot>
- <screeninfo>Finished Maven Install</screeninfo>
+ <para>The resulting jars are put in the /target directory from the top
+ level of the project.</para>
- <mediaobject>
- <imageobject>
- <imagedata fileref="mvn_install3.jpg" />
- </imageobject>
- </mediaobject>
- </screenshot>
+ <para>As Ant builds each module it will install the resulting jars in the
+ local Maven 2 repository automatically. Where it can be easily used from
+ other project <literal>pom.xml</literal> or copied else where.</para>
- <para>As Maven builds each module it will install the resulting jars in
- the local Maven 2 repository. Where it can be easily used from other
- project <literal>pom.xml</literal> or copied else where.</para>
-
<screenshot>
<screeninfo>Installed Drools Jars</screeninfo>
Modified: labs/jbossrules/trunk/documentation/manual/en/Chapter-Install/Section-Setup.xml
===================================================================
--- labs/jbossrules/trunk/documentation/manual/en/Chapter-Install/Section-Setup.xml 2006-05-17 03:50:06 UTC (rev 4269)
+++ labs/jbossrules/trunk/documentation/manual/en/Chapter-Install/Section-Setup.xml 2006-05-17 04:38:15 UTC (rev 4270)
@@ -15,7 +15,7 @@
<listitem>
<para><indexterm>
<primary>eclipse</primary>
- </indexterm>Eclipse 3.2 RC1</para>
+ </indexterm>Eclipse 3.2 </para>
<para>http://www.eclipse.org/</para>
</listitem>
@@ -41,28 +41,23 @@
<para>http://ant.apache.org</para>
</listitem>
- <listitem>
- <para><indexterm>
- <primary>Maven</primary>
- </indexterm>Maven 2.0.4</para>
-
- <para>http://maven.apache.org</para>
- </listitem>
</itemizedlist>
- <para>Ensure the executeables for ant, maven and java are in your <indexterm>
+ <para>Ensure the executeables for ant and java are in your <indexterm>
<primary>path</primary>
</indexterm>path. The examples given illustrative and are for a win32
system:</para>
- <literallayout>Path=D:\java\j2sdk1.4.2_10\bin;C:\bin;D:\java\maven-2.0.4\bin;D:\java\apache-ant-1.6.5\bin;</literallayout>
+ <literallayout>Path=D:\java\j2sdk1.4.2_10\bin;D:\java\apache-ant-1.6.5\bin;</literallayout>
<para>Following environment variables will also need to be set. The examples
given illustrative and are for a win32 system::</para>
<literallayout>JAVA_HOME=D:\java\j2sdk1.4.2_10
-M2_HOME=D:\java\maven-2.0.4
-M2_REPO=<your home directory>\.m2\repository
ANT_HOME=D:\java\apache-ant-1.6.5
+
</literallayout>
+ <para>
+ Past releases used to use maven 2 as the build mechanism, but now ant is used as the primary mechanism. Maven is used underneath the covers as the mechanism for managing project dependencies etc. (You can of course still have maven 2 installed and use it if needed - there is a pom.xml structure for each module - this is what is used for dependency management).
+ </para>
</section>
\ No newline at end of file
Modified: labs/jbossrules/trunk/documentation/training/developers-course/course_outline.odt
===================================================================
(Binary files differ)
|
|
From: <jbo...@li...> - 2006-05-17 03:50:10
|
Author: mar...@jb...
Date: 2006-05-16 23:50:06 -0400 (Tue, 16 May 2006)
New Revision: 4269
Modified:
labs/jbossrules/trunk/build.xml
Log:
-missed with message width for 80col consoles
Modified: labs/jbossrules/trunk/build.xml
===================================================================
--- labs/jbossrules/trunk/build.xml 2006-05-17 03:37:29 UTC (rev 4268)
+++ labs/jbossrules/trunk/build.xml 2006-05-17 03:50:06 UTC (rev 4269)
@@ -39,9 +39,9 @@
<echo level="info" message="dist-all - generates the distribution builds for" />
<echo level="info" message=" src, bin, bin-withdeps and examples" />
<echo level="info" message=" " />
- <echo level="info" message="Each module can individually be executed with clean, compile, test and build." />
- <echo level="info" message="To use simply use the following commands, replace ${module} with one of the" />
- <echo level="info" message="module names:" />
+ <echo level="info" message="Each module can individually be executed with clean, compile," />
+ <echo level="info" message="test and build. To use simply use the following commands, " />
+ <echo level="info" message="replace ${module} with one of the module names:" />
<echo level="info" message="clean-${module}" />
<echo level="info" message="compile-${module}" />
<echo level="info" message="test-${module}" />
@@ -53,7 +53,7 @@
<echo level="info" message="dist-bin-withdeps" />
<echo level="info" message="dist-examples" />
<echo level="info" message=" " />
- <echo level="info" message="you may also pass the following system properties:" />
+ <echo level="info" message="You may also pass the following system properties:" />
<echo level="info" message="-Dtest.skip=true" />
<echo level="info" message="-Djavadocs.skip=true" />
<echo level="info" message="-Dmanual.skip=true" />
@@ -61,8 +61,9 @@
<echo level="info" message="Targets may be combined:" />
<echo level="info" message="ant -Dtest.skip clean-all build-all" />
<echo level="info" message=" " />
- <echo level="info" message="for more help use the build system to generate the manual or you can find" />
- <echo level="info" message="the manual online at http://labs.jboss.com/portal/jbossrules/docs/index.html" />
+ <echo level="info" message="For more help use the build system to generate the manual" />
+ <echo level="info" message="or you can find the manual online at:" />
+ <echo level="info" message="http://labs.jboss.com/portal/jbossrules/docs/index.html" />
</target>
<target name="init" depends="init-maven">
|
|
From: <jbo...@li...> - 2006-05-17 03:37:37
|
Author: mic...@jb...
Date: 2006-05-16 23:37:29 -0400 (Tue, 16 May 2006)
New Revision: 4268
Added:
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/lang/multiple_bindings_more.drl
Modified:
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/RuleParserTest.java
Log:
put a test back in
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/RuleParserTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/RuleParserTest.java 2006-05-17 03:32:43 UTC (rev 4267)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/RuleParserTest.java 2006-05-17 03:37:29 UTC (rev 4268)
@@ -419,9 +419,7 @@
assertFalse( parser.hasErrors() );
}
- /** Note this is only to be enabled if we agree to combine patterns from columns bound to the same var.
- * At present, not a valid test. Refer to AndDescr and AndDescrTest (Michael Neale).
- */
+
public void testMultiBindings() throws Exception {
RuleDescr rule = parseResource( "multiple_bindings.drl" ).rule();
assertNotNull( rule );
@@ -432,7 +430,20 @@
assertEquals("baz", ( (ColumnDescr) rule.getLhs().getDescrs().get( 1 )).getIdentifier());
}
+
+ public void testMultiBindingsMore() throws Exception {
+ RuleDescr rule = parseResource( "multiple_bindings_more.drl" ).rule();
+ assertNotNull( rule );
+ assertEquals( "simple_rule", rule.getName() );
+
+ assertEquals(3, rule.getLhs().getDescrs().size());
+ assertEquals("foo", ( (ColumnDescr) rule.getLhs().getDescrs().get( 0 )).getIdentifier());
+ assertEquals("something foo", ( (EvalDescr) rule.getLhs().getDescrs().get( 1 )).getText());
+ assertEquals("another foo", ( (EvalDescr) rule.getLhs().getDescrs().get( 2 )).getText());
+
+ }
+
public void testLhsSemicolonDelim() throws Exception {
RuleDescr rule = parseResource( "lhs_semicolon_delim.drl" ).rule();
Added: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/lang/multiple_bindings_more.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/lang/multiple_bindings_more.drl 2006-05-17 03:32:43 UTC (rev 4267)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/lang/multiple_bindings_more.drl 2006-05-17 03:37:29 UTC (rev 4268)
@@ -0,0 +1,12 @@
+#trying to show how it will normalise biondings
+rule simple_rule
+ when
+ foo : Bar()
+ eval(something foo)
+
+ foo : Bar()
+ eval(another foo)
+
+ then
+ Baz();
+end
\ No newline at end of file
Property changes on: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/lang/multiple_bindings_more.drl
___________________________________________________________________
Name: svn:eol-style
+ native
|
|
From: <jbo...@li...> - 2006-05-17 03:32:46
|
Author: mar...@jb... Date: 2006-05-16 23:32:43 -0400 (Tue, 16 May 2006) New Revision: 4267 Modified: labs/jbossrules/trunk/drools-ide/.classpath labs/jbossrules/trunk/drools-ide/META-INF/MANIFEST.MF Log: -updated classpath information Modified: labs/jbossrules/trunk/drools-ide/.classpath =================================================================== --- labs/jbossrules/trunk/drools-ide/.classpath 2006-05-17 03:24:30 UTC (rev 4266) +++ labs/jbossrules/trunk/drools-ide/.classpath 2006-05-17 03:32:43 UTC (rev 4267) @@ -5,11 +5,11 @@ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="lib" path="lib/xstream-1.1.3.jar"/> - <classpathentry kind="lib" path="lib/drools-compiler.jar"/> - <classpathentry kind="lib" path="lib/drools-core.jar"/> <classpathentry kind="lib" path="lib/commons-lang-2.1.jar"/> <classpathentry kind="lib" path="lib/junit-3.8.1.jar"/> <classpathentry kind="lib" path="lib/antlr-3.0ea8.jar"/> - <classpathentry kind="lib" path="lib/commons-jci-core-1.0-SNAPSHOT.jar"/> + <classpathentry kind="lib" path="lib/commons-jci-core-1.0-406301.jar"/> + <classpathentry kind="lib" path="lib/drools-compiler-3.0-RC-3.jar"/> + <classpathentry kind="lib" path="lib/drools-core-3.0-RC-3.jar"/> <classpathentry kind="output" path="bin"/> </classpath> Modified: labs/jbossrules/trunk/drools-ide/META-INF/MANIFEST.MF =================================================================== --- labs/jbossrules/trunk/drools-ide/META-INF/MANIFEST.MF 2006-05-17 03:24:30 UTC (rev 4266) +++ labs/jbossrules/trunk/drools-ide/META-INF/MANIFEST.MF 2006-05-17 03:32:43 UTC (rev 4267) @@ -37,18 +37,17 @@ lib/commons-lang-2.1.jar, lib/commons-logging-api-1.0.4.jar, lib/concurrent-1.3.4.jar, - lib/core-3.2.0.658.jar, - lib/drools-compiler.jar, - lib/drools-core.jar, lib/jung-1.7.2.jar, lib/stringtemplate-2.3b6.jar, lib/xercesImpl-2.6.2.jar, lib/xml-apis-1.0.b2.jar, lib/xpp3-1.1.3.4.O.jar, lib/xstream-1.1.3.jar, - lib/commons-jci-core-1.0-SNAPSHOT.jar, - lib/commons-jci-eclipse-3.2.0.658.jar, - lib/commons-jci-janino-2.4.1.jar, - lib/drools-jsr94.jar, - lib/janino-2.4.1.jar, - lib/jsr94-1.1.jar + lib/jsr94-1.1.jar, + lib/core-3.2.0.666.jar, + lib/commons-jci-core-1.0-406301.jar, + lib/commons-jci-eclipse-3.2.0.666.jar, + lib/commons-jci-janino-2.4.3.jar, + lib/drools-compiler-3.0-RC-3.jar, + lib/drools-core-3.0-RC-3.jar, + lib/janino-2.4.3.jar |
|
From: <jbo...@li...> - 2006-05-17 03:24:35
|
Author: mar...@jb...
Date: 2006-05-16 23:24:30 -0400 (Tue, 16 May 2006)
New Revision: 4266
Modified:
labs/jbossrules/trunk/drools-compiler/.classpath
labs/jbossrules/trunk/drools-core/.classpath
labs/jbossrules/trunk/drools-decisiontables/.classpath
labs/jbossrules/trunk/drools-decisiontables/.project
labs/jbossrules/trunk/drools-jsr94/.classpath
labs/jbossrules/trunk/drools-jsr94/.project
Log:
-updated to latest jdt and janino versions
Modified: labs/jbossrules/trunk/drools-compiler/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-compiler/.classpath 2006-05-17 03:19:56 UTC (rev 4265)
+++ labs/jbossrules/trunk/drools-compiler/.classpath 2006-05-17 03:24:30 UTC (rev 4266)
@@ -5,24 +5,24 @@
<classpathentry kind="src" path="src/test/resources" output="target/test-classes"/>
<classpathentry kind="output" path="target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/xpp3/xpp3/1.1.3.4.O/xpp3-1.1.3.4.O.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.1/commons-io-1.1.jar"/>
<classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.2.0.658/core-3.2.0.658.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xstream/xstream/1.1.3/xstream-1.1.3.jar"/>
<classpathentry kind="var" path="M2_REPO/jung/jung/1.7.2/jung-1.7.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/janino/janino/2.4.1/janino-2.4.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-jci-eclipse/3.2.0.658/commons-jci-eclipse-3.2.0.658.jar"/>
+ <classpathentry kind="src" path="/drools-core"/>
+ <classpathentry kind="var" path="M2_REPO/colt/colt/1.2.0/colt-1.2.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/janino/janino/2.4.3/janino-2.4.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-jci-core/1.0-406301/commons-jci-core-1.0-406301.jar"/>
+ <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar"/>
<classpathentry kind="var" path="M2_REPO/antlr/stringtemplate/2.3b6/stringtemplate-2.3b6.jar"/>
- <classpathentry kind="src" path="/drools-core"/>
- <classpathentry kind="var" path="M2_REPO/xstream/xstream/1.1.3/xstream-1.1.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/antlr/antlr/3.0ea8/antlr-3.0ea8.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.1/commons-io-1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-jci-eclipse/3.2.0.666/commons-jci-eclipse-3.2.0.666.jar"/>
<classpathentry kind="var" path="M2_REPO/concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/antlr/antlr/3.0ea8/antlr-3.0ea8.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-jci-janino/2.4.1/commons-jci-janino-2.4.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging-api/1.0.4/commons-logging-api-1.0.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xpp3/xpp3/1.1.3.4.O/xpp3-1.1.3.4.O.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.2.0.658/core-3.2.0.658.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-jci-janino/2.4.3/commons-jci-janino-2.4.3.jar"/>
<classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.1/commons-lang-2.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging-api/1.0.4/commons-logging-api-1.0.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-jci-core/1.0-SNAPSHOT/commons-jci-core-1.0-SNAPSHOT.jar"/>
- <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/colt/colt/1.2.0/colt-1.2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
</classpath>
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-core/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-core/.classpath 2006-05-17 03:19:56 UTC (rev 4265)
+++ labs/jbossrules/trunk/drools-core/.classpath 2006-05-17 03:24:30 UTC (rev 4266)
@@ -1,15 +1,16 @@
<classpath>
<classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="src/main/resources"/>
<classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
<classpathentry kind="src" path="src/test/resources" output="target/test-classes"/>
<classpathentry kind="output" path="target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/xpp3/xpp3/1.1.3.4.O/xpp3-1.1.3.4.O.jar"/>
+ <classpathentry kind="var" path="M2_REPO/concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar"/>
<classpathentry kind="var" path="M2_REPO/xstream/xstream/1.1.3/xstream-1.1.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/colt/colt/1.2.0/colt-1.2.0.jar"/>
<classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/colt/colt/1.2.0/colt-1.2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xpp3/xpp3/1.1.3.4.O/xpp3-1.1.3.4.O.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jung/jung/1.7.2/jung-1.7.2.jar"/>
<classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/jung/jung/1.7.2/jung-1.7.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar"/>
</classpath>
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-decisiontables/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-decisiontables/.classpath 2006-05-17 03:19:56 UTC (rev 4265)
+++ labs/jbossrules/trunk/drools-decisiontables/.classpath 2006-05-17 03:24:30 UTC (rev 4266)
@@ -5,26 +5,26 @@
<classpathentry kind="src" path="src/test/resources" output="target/test-classes"/>
<classpathentry kind="output" path="target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var" path="M2_REPO/poi/poi/2.5.1-final-20040804/poi-2.5.1-final-20040804.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xpp3/xpp3/1.1.3.4.O/xpp3-1.1.3.4.O.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-jci-eclipse/3.2.0.666/commons-jci-eclipse-3.2.0.666.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.1/commons-io-1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/antlr/antlr/3.0ea8/antlr-3.0ea8.jar"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
+ <classpathentry kind="src" path="/drools-core"/>
+ <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.1/commons-lang-2.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging-api/1.0.4/commons-logging-api-1.0.4.jar"/>
<classpathentry kind="src" path="/drools-compiler"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-jci-core/1.0-SNAPSHOT/commons-jci-core-1.0-SNAPSHOT.jar"/>
<classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.2.0.658/core-3.2.0.658.jar"/>
+ <classpathentry kind="var" path="M2_REPO/janino/janino/2.4.3/janino-2.4.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/colt/colt/1.2.0/colt-1.2.0.jar"/>
<classpathentry kind="var" path="M2_REPO/antlr/stringtemplate/2.3b6/stringtemplate-2.3b6.jar"/>
- <classpathentry kind="var" path="M2_REPO/colt/colt/1.2.0/colt-1.2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-jci-eclipse/3.2.0.658/commons-jci-eclipse-3.2.0.658.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.1/commons-lang-2.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/poi/poi/2.5.1-final-20040804/poi-2.5.1-final-20040804.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xstream/xstream/1.1.3/xstream-1.1.3.jar"/>
<classpathentry kind="var" path="M2_REPO/concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/xstream/xstream/1.1.3/xstream-1.1.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging-api/1.0.4/commons-logging-api-1.0.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-jci-janino/2.4.1/commons-jci-janino-2.4.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/janino/janino/2.4.1/janino-2.4.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/xpp3/xpp3/1.1.3.4.O/xpp3-1.1.3.4.O.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-jci-janino/2.4.3/commons-jci-janino-2.4.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar"/>
<classpathentry kind="var" path="M2_REPO/jung/jung/1.7.2/jung-1.7.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.1/commons-io-1.1.jar"/>
- <classpathentry kind="src" path="/drools-core"/>
- <classpathentry kind="var" path="M2_REPO/org/antlr/antlr/3.0ea8/antlr-3.0ea8.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-jci-core/1.0-406301/commons-jci-core-1.0-406301.jar"/>
<classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
</classpath>
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-decisiontables/.project
===================================================================
--- labs/jbossrules/trunk/drools-decisiontables/.project 2006-05-17 03:19:56 UTC (rev 4265)
+++ labs/jbossrules/trunk/drools-decisiontables/.project 2006-05-17 03:24:30 UTC (rev 4266)
@@ -2,8 +2,8 @@
<name>drools-decisiontables</name>
<comment/>
<projects>
+ <project>drools-core</project>
<project>drools-compiler</project>
- <project>drools-core</project>
</projects>
<buildSpec>
<buildCommand>
Modified: labs/jbossrules/trunk/drools-jsr94/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-jsr94/.classpath 2006-05-17 03:19:56 UTC (rev 4265)
+++ labs/jbossrules/trunk/drools-jsr94/.classpath 2006-05-17 03:24:30 UTC (rev 4266)
@@ -1,32 +1,33 @@
<classpath>
<classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="src/main/resources"/>
<classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
<classpathentry kind="src" path="src/test/resources" output="target/test-classes"/>
<classpathentry kind="output" path="target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.1/commons-lang-2.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.1/commons-io-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/antlr/stringtemplate/2.3b6/stringtemplate-2.3b6.jar"/>
- <classpathentry kind="var" path="M2_REPO/jsr94/jsr94-tck/1.0.3/jsr94-tck-1.0.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/colt/colt/1.2.0/colt-1.2.0.jar"/>
+ <classpathentry kind="src" path="/drools-compiler"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-jci-janino/2.4.3/commons-jci-janino-2.4.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/janino/janino/2.4.3/janino-2.4.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/>
<classpathentry kind="var" path="M2_REPO/xstream/xstream/1.1.3/xstream-1.1.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jsr94/jsr94/1.1/jsr94-1.1.jar"/>
<classpathentry kind="src" path="/drools-core"/>
+ <classpathentry kind="var" path="M2_REPO/jsr94/jsr94-tck/1.0.3/jsr94-tck-1.0.3.jar"/>
<classpathentry kind="var" path="M2_REPO/jung/jung/1.7.2/jung-1.7.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/jsr94/jsr94-sigtest/1.1/jsr94-sigtest-1.1.jar"/>
<classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar"/>
- <classpathentry kind="var" path="M2_REPO/jsr94/jsr94/1.1/jsr94-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-jci-eclipse/3.2.0.658/commons-jci-eclipse-3.2.0.658.jar"/>
- <classpathentry kind="var" path="M2_REPO/janino/janino/2.4.1/janino-2.4.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/xpp3/xpp3/1.1.3.4.O/xpp3-1.1.3.4.O.jar"/>
- <classpathentry kind="src" path="/drools-compiler"/>
+ <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.1/commons-lang-2.1.jar"/>
<classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/antlr/stringtemplate/2.3b6/stringtemplate-2.3b6.jar"/>
<classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.2.0.658/core-3.2.0.658.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-jci-core/1.0-SNAPSHOT/commons-jci-core-1.0-SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-jci-core/1.0-406301/commons-jci-core-1.0-406301.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.1/commons-io-1.1.jar"/>
<classpathentry kind="var" path="M2_REPO/org/antlr/antlr/3.0ea8/antlr-3.0ea8.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-jci-janino/2.4.1/commons-jci-janino-2.4.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jsr94/jsr94-sigtest/1.1/jsr94-sigtest-1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xpp3/xpp3/1.1.3.4.O/xpp3-1.1.3.4.O.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging-api/1.0.4/commons-logging-api-1.0.4.jar"/>
<classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/colt/colt/1.2.0/colt-1.2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging-api/1.0.4/commons-logging-api-1.0.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-jci-eclipse/3.2.0.666/commons-jci-eclipse-3.2.0.666.jar"/>
</classpath>
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-jsr94/.project
===================================================================
--- labs/jbossrules/trunk/drools-jsr94/.project 2006-05-17 03:19:56 UTC (rev 4265)
+++ labs/jbossrules/trunk/drools-jsr94/.project 2006-05-17 03:24:30 UTC (rev 4266)
@@ -2,8 +2,8 @@
<name>drools-jsr94</name>
<comment/>
<projects>
+ <project>drools-compiler</project>
<project>drools-core</project>
- <project>drools-compiler</project>
</projects>
<buildSpec>
<buildCommand>
|
|
From: <jbo...@li...> - 2006-05-17 03:19:59
|
Author: mar...@jb...
Date: 2006-05-16 23:19:56 -0400 (Tue, 16 May 2006)
New Revision: 4265
Modified:
labs/jbossrules/trunk/build.xml
Log:
-tweaked the help message
Modified: labs/jbossrules/trunk/build.xml
===================================================================
--- labs/jbossrules/trunk/build.xml 2006-05-17 03:19:12 UTC (rev 4264)
+++ labs/jbossrules/trunk/build.xml 2006-05-17 03:19:56 UTC (rev 4265)
@@ -11,9 +11,15 @@
<echo level="info" message="drools-decisiontables" />
<echo level="info" message="drools-jsr94" />
<echo level="info" message=" " />
- <echo level="info" message="Further to this there are two eclipse project:" />
- <echo level="info" message="drools-examples - to use open eclipse and import." />
- <echo level="info" message="drools-ide - to use open eclipse and import." />
+ <echo level="info" message="Further to this there are two Eclipse project:" />
+ <echo level="info" message="drools-examples - To use open eclipse and import." />
+ <echo level="info" message=" Requires the Drools eclipse plugin." />
+ <echo level="info" message=" Either build the plugin from drools-ide" />
+ <echo level="info" message=" or install from the Eclipse update site" />
+ <echo level="info" message=" http://anonsvn.labs.jboss.com/labs/jbossrules/updates" />
+ <echo level="info" message="drools-ide - To use open Eclipse and import." />
+ <echo level="info" message=" Select export and plugin fragements to" />
+ <echo level="info" message=" generate the Drools Eclipse plugin" />
<echo level="info" message=" Depends on all the depencies being copied" />
<echo level="info" message=" to its lib directory at the end of build-all," />
<echo level="info" message=" which calls copy-deps." />
|
|
From: <jbo...@li...> - 2006-05-17 03:19:17
|
Author: mic...@jb...
Date: 2006-05-16 23:19:12 -0400 (Tue, 16 May 2006)
New Revision: 4264
Modified:
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/descr/AndDescrTest.java
Log:
put a test back in
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/descr/AndDescrTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/descr/AndDescrTest.java 2006-05-17 02:03:38 UTC (rev 4263)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/descr/AndDescrTest.java 2006-05-17 03:19:12 UTC (rev 4264)
@@ -14,7 +14,7 @@
}
/** This is for combining bound columns with the same name patterns together */
- public void xxtestAddBoundCols() {
+ public void testAddBoundCols() {
AndDescr and = new AndDescr();
ColumnDescr col1 = new ColumnDescr("Foo");
col1.setIdentifier( "foo" );
|
|
From: <jbo...@li...> - 2006-05-17 02:03:40
|
Author: mar...@jb...
Date: 2006-05-16 22:03:38 -0400 (Tue, 16 May 2006)
New Revision: 4263
Modified:
labs/jbossrules/trunk/build.xml
Log:
-message correction
Modified: labs/jbossrules/trunk/build.xml
===================================================================
--- labs/jbossrules/trunk/build.xml 2006-05-17 01:58:29 UTC (rev 4262)
+++ labs/jbossrules/trunk/build.xml 2006-05-17 02:03:38 UTC (rev 4263)
@@ -44,7 +44,7 @@
<echo level="info" message="Generates specific distribution builds:" />
<echo level="info" message="dist-src" />
<echo level="info" message="dist-bin" />
- <echo level="info" message="dist-bin-withdepss" />
+ <echo level="info" message="dist-bin-withdeps" />
<echo level="info" message="dist-examples" />
<echo level="info" message=" " />
<echo level="info" message="you may also pass the following system properties:" />
|
|
From: <jbo...@li...> - 2006-05-17 01:58:32
|
Author: mar...@jb...
Date: 2006-05-16 21:58:29 -0400 (Tue, 16 May 2006)
New Revision: 4262
Modified:
labs/jbossrules/trunk/build.xml
Log:
-correction to help message
Modified: labs/jbossrules/trunk/build.xml
===================================================================
--- labs/jbossrules/trunk/build.xml 2006-05-17 01:31:40 UTC (rev 4261)
+++ labs/jbossrules/trunk/build.xml 2006-05-17 01:58:29 UTC (rev 4262)
@@ -27,8 +27,8 @@
<echo level="info" message=" " />
<echo level="info" message="javadocs - generates the javadoc at target/docs" />
<echo level="info" message=" " />
- <echo level="info" message="manual - generates the docbook documtation in" />
- <echo level="info" message=" html and single_html format" />
+ <echo level="info" message="manual - generates the docbook documentation in" />
+ <echo level="info" message=" html and single_html format at target/docs" />
<echo level="info" message=" " />
<echo level="info" message="dist-all - generates the distribution builds for" />
<echo level="info" message=" src, bin, bin-withdeps and examples" />
|
|
From: <jbo...@li...> - 2006-05-17 01:31:44
|
Author: mar...@jb...
Date: 2006-05-16 21:31:40 -0400 (Tue, 16 May 2006)
New Revision: 4261
Modified:
labs/jbossrules/trunk/README.txt
labs/jbossrules/trunk/build.xml
Log:
-build fixes, including adding help
Modified: labs/jbossrules/trunk/README.txt
===================================================================
--- labs/jbossrules/trunk/README.txt 2006-05-17 00:41:04 UTC (rev 4260)
+++ labs/jbossrules/trunk/README.txt 2006-05-17 01:31:40 UTC (rev 4261)
@@ -1,15 +1,4 @@
-Welcome to JBoss Rules.
+Welcome to Drools
+-----------------
-Please look in
-
-a)
-./drools-compiler/src/test/resources/org/drools/integrationtests
-For example rules.
-
-and
-
-b)
-./drools-compiler/src/test/java/org/drools/integrationtests
-For how to invoke them.
-
-The drools-ide sub project is the Eclipse based IDE.
\ No newline at end of file
+Type "ant help", from the command line, for a list of a build commands.
\ No newline at end of file
Modified: labs/jbossrules/trunk/build.xml
===================================================================
--- labs/jbossrules/trunk/build.xml 2006-05-17 00:41:04 UTC (rev 4260)
+++ labs/jbossrules/trunk/build.xml 2006-05-17 01:31:40 UTC (rev 4261)
@@ -1,5 +1,63 @@
-<project name="Drools" basedir="." xmlns:artifact="urn:maven-artifact-ant">
+<project name="Drools" basedir="." xmlns:artifact="urn:maven-artifact-ant" default="help">
<property name="version" value="3.0-RC-3"/>
+
+ <target name="help">
+ <echo level="info" message="Drools Build Help" />
+ <echo level="info" message="-----------------" />
+ <echo level="info" message=" " />
+ <echo level="info" message="The build process is for the following four modules:" />
+ <echo level="info" message="drools-core" />
+ <echo level="info" message="drools-compiler" />
+ <echo level="info" message="drools-decisiontables" />
+ <echo level="info" message="drools-jsr94" />
+ <echo level="info" message=" " />
+ <echo level="info" message="Further to this there are two eclipse project:" />
+ <echo level="info" message="drools-examples - to use open eclipse and import." />
+ <echo level="info" message="drools-ide - to use open eclipse and import." />
+ <echo level="info" message=" Depends on all the depencies being copied" />
+ <echo level="info" message=" to its lib directory at the end of build-all," />
+ <echo level="info" message=" which calls copy-deps." />
+ <echo level="info" message=" " />
+ <echo level="info" message="Targets" />
+ <echo level="info" message="-----" />
+ <echo level="info" message=" " />
+ <echo level="info" message="clean-all - cleans all directories" />
+ <echo level="info" message=" " />
+ <echo level="info" message="build-all - builds all modules" />
+ <echo level="info" message=" " />
+ <echo level="info" message="javadocs - generates the javadoc at target/docs" />
+ <echo level="info" message=" " />
+ <echo level="info" message="manual - generates the docbook documtation in" />
+ <echo level="info" message=" html and single_html format" />
+ <echo level="info" message=" " />
+ <echo level="info" message="dist-all - generates the distribution builds for" />
+ <echo level="info" message=" src, bin, bin-withdeps and examples" />
+ <echo level="info" message=" " />
+ <echo level="info" message="Each module can individually be executed with clean, compile, test and build." />
+ <echo level="info" message="To use simply use the following commands, replace ${module} with one of the" />
+ <echo level="info" message="module names:" />
+ <echo level="info" message="clean-${module}" />
+ <echo level="info" message="compile-${module}" />
+ <echo level="info" message="test-${module}" />
+ <echo level="info" message="build-${module}" />
+ <echo level="info" message=" " />
+ <echo level="info" message="Generates specific distribution builds:" />
+ <echo level="info" message="dist-src" />
+ <echo level="info" message="dist-bin" />
+ <echo level="info" message="dist-bin-withdepss" />
+ <echo level="info" message="dist-examples" />
+ <echo level="info" message=" " />
+ <echo level="info" message="you may also pass the following system properties:" />
+ <echo level="info" message="-Dtest.skip=true" />
+ <echo level="info" message="-Djavadocs.skip=true" />
+ <echo level="info" message="-Dmanual.skip=true" />
+ <echo level="info" message=" " />
+ <echo level="info" message="Targets may be combined:" />
+ <echo level="info" message="ant -Dtest.skip clean-all build-all" />
+ <echo level="info" message=" " />
+ <echo level="info" message="for more help use the build system to generate the manual or you can find" />
+ <echo level="info" message="the manual online at http://labs.jboss.com/portal/jbossrules/docs/index.html" />
+ </target>
<target name="init" depends="init-maven">
<mkdir dir="target/dist" />
@@ -17,23 +75,18 @@
<artifact:remoteRepository id="jboss.repository" url="http://repository.jboss.com/maven2" />
- <artifact:remoteRepository id="ibiblio.repository" url="http://www.ibiblio.org/maven2" />
+ <artifact:remoteRepository id="ibiblio.repository" url="http://www.ibiblio.org/maven2" />
- <artifact:remoteRepository id="local.repository" url="file://${basedir}/repository" />
-
- <artifact:dependencies pathId="parent.dependency.classpath" filesetId="parent.dependency.fileset" verbose="false">
- <pom file="pom.xml"/>
- </artifact:dependencies>
+ <artifact:remoteRepository id="drools-local.repository" url="file://${basedir}/repository" />
+ <artifact:install>
+ <pom file="pom.xml" />
+ </artifact:install>
+
</target>
- <!-- Note this is a hack because maven from ant will not install the parent pom !!!! -->
- <target name="install-parent-pom">
- <mkdir dir="${user.home}/.m2/repository/org/drools/drools/${version}" />
- <copy file="pom.xml" tofile="${user.home}/.m2/repository/org/drools/drools/${version}/drools-${version}.pom" />
- </target>
- <target name="compile-core" depends="init,install-parent-pom">
+ <target name="compile-core" depends="init">
<antcall target="compile-module">
<param name="module" value="drools-core"/>
</antcall>
@@ -74,7 +127,7 @@
</target>
<target name="clean-compiler">
- <delete dir="drools-target/target"/>
+ <delete dir="drools-compiler/target"/>
</target>
<target name="compile-decisiontables" depends="build-compiler">
@@ -127,7 +180,7 @@
<target name="test-all" depends="test-core, test-compiler, test-decisiontables, test-jsr94">
</target>
- <target name="build-all" depends="build-core, build-compiler, build-decisiontables, build-jsr94">
+ <target name="build-all" depends="build-core, build-compiler, build-decisiontables, build-jsr94, copy-deps">
</target>
<target name="clean-all" depends="clean-core, clean-compiler, clean-decisiontables, clean-jsr94">
@@ -141,6 +194,8 @@
<fileset dir="repository" includes="*"/>
</delete>
+ <delete dir="documentation/manual/build" />
+
</target>
<target name="compile-module">
@@ -156,7 +211,8 @@
</copy>
<javac srcdir="${module}/src/main/java"
- destdir="${module}/target/classes">
+ destdir="${module}/target/classes"
+ source="1.4">
<classpath>
<path refid="${module}.dependency.classpath" />
<fileset dir="target">
@@ -179,7 +235,8 @@
</copy>
<javac srcdir="${module}/src/test/java"
- destdir="${module}/target/test-classes">
+ destdir="${module}/target/test-classes"
+ source="1.4">
<classpath>
<path refid="${module}.dependency.classpath" />
<pathelement location="${module}/target/classes"/>
@@ -224,10 +281,23 @@
</target>
<target name="manual" unless="skip.manual">
- <ant dir="documentation/manual" />
+ <delete dir="documentation/manual/build" />
+ <ant dir="documentation/manual" />
+
+ <move todir="target/docs">
+ <fileset dir="documentation/manual/build/en" includes="shared/** html/** html_single/**" excludes="**/*.svg **/*.db" />
+ </move>
</target>
- <target name="javadocs" unless="skip.javadocs">
+ <target name="javadocs" depends="build-all" unless="skip.javadocs">
+ <available file="ydoc" type="dir" property="ydocs" />
+
+ <antcall target="standard-javadocs" />
+
+ <antcall target="ydocs" />
+ </target>
+
+ <target name="standard-javadocs" unless="ydocs">
<javadoc
packagenames="org.drools.*"
excludepackagenames="org.drools.asm.*"
@@ -249,7 +319,7 @@
</javadoc>
</target>
- <target name="ydocs" unless="skip.javadocs">
+ <target name="ydocs" if="ydocs">
<javadoc
packagenames="org.drools.*"
excludepackagenames="org.drools.asm.*"
@@ -293,7 +363,7 @@
</target>
- <target name="dist-all" depends="build-all, copy-deps, javadocs, manual, dist-src, dist-bin, dist-bin-withdeps, dist-examples">
+ <target name="dist-all" depends="dist-src, dist-bin, dist-bin-withdeps, dist-examples">
</target>
<target name="dist-examples">
@@ -308,7 +378,7 @@
</zip>
</target>
- <target name="dist-src">
+ <target name="dist-src" depends="build-all, copy-deps, javadocs, manual">
<zip destfile="target/dist/drools-${version}-src.zip">
<zipfileset dir="."
includes="*.xml" />
@@ -336,40 +406,39 @@
</zip>
</target>
- <target name="dist-bin">
+ <target name="dist-bin" depends="build-all, copy-deps, javadocs, manual">
<zip destfile="target/dist/drools-${version}-bin.zip">
<zipfileset dir="target/docs"
prefix="docs" />
- <zipfileset dir="documentation/manual/build/en/shared"
+ <zipfileset dir="target/docs/shared"
excludes="**/*.svg **/*.db"
prefix="docs/shared" />
- <zipfileset dir="documentation/manual/build/en/html_single"
+ <zipfileset dir="target/docs/html_single"
prefix="docs/html_single" />
- <zipfileset dir="documentation/manual/build/en/html"
- prefix="docs/html" />
-
+ <zipfileset dir="target/docs/html"
+ prefix="docs/html" />
+
<zipfileset dir="target"
includes="**/drools-*.jar" />
</zip>
</target>
- <target name="dist-bin-withdeps">
+ <target name="dist-bin-withdeps" depends="build-all, copy-deps, javadocs, manual">
<zip destfile="target/dist/drools-${version}-bin-withdeps.zip">
-
<zipfileset dir="target/docs"
prefix="docs" />
- <zipfileset dir="documentation/manual/build/en/shared"
+ <zipfileset dir="target/docs/shared"
excludes="**/*.svg **/*.db"
prefix="docs/shared" />
- <zipfileset dir="documentation/manual/build/en/html_single"
- prefix="docs/html_single" />
-
- <zipfileset dir="documentation/manual/build/en/html"
+ <zipfileset dir="target/docs/html_single"
+ prefix="docs/html_single" />
+
+ <zipfileset dir="target/docs/html"
prefix="docs/html" />
<zipfileset dir="target"
@@ -399,9 +468,8 @@
<artifact:dependencies filesetId="drools-jsr94.dependency.fileset" verbose="false">
<pom file="drools-jsr94/pom.xml"/>
</artifact:dependencies>
-
+
<copy todir="repository">
- <fileset refid="parent.dependency.fileset"/>
<fileset refid="drools-core.dependency.fileset"/>
<fileset refid="drools-compiler.dependency.fileset"/>
<fileset refid="drools-decisiontables.dependency.fileset"/>
|
|
From: <jbo...@li...> - 2006-05-17 00:41:08
|
Author: KrisVerlaenen
Date: 2006-05-16 20:41:04 -0400 (Tue, 16 May 2006)
New Revision: 4260
Modified:
labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/editors/DRLRuleEditor2.java
Log:
DRL editor is now closed if file is closed
The name of the file in the top tab of the DRL editor i snow updated if name of file changes
Modified: labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/editors/DRLRuleEditor2.java
===================================================================
--- labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/editors/DRLRuleEditor2.java 2006-05-16 23:38:33 UTC (rev 4259)
+++ labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/editors/DRLRuleEditor2.java 2006-05-17 00:41:04 UTC (rev 4260)
@@ -25,7 +25,16 @@
protected void addPages() {
try {
- textEditor = new DRLRuleEditor();
+ textEditor = new DRLRuleEditor() {
+ public void close(boolean save) {
+ super.close(save);
+ DRLRuleEditor2.this.close(save);
+ }
+ protected void setPartName(String partName) {
+ super.setPartName(partName);
+ DRLRuleEditor2.this.setPartName(partName);
+ }
+ };
reteViewer = new ReteViewer(this, textEditor.getDocumentProvider());
int text = addPage(textEditor, getEditorInput());
|
|
From: <jbo...@li...> - 2006-05-16 23:38:39
|
Author: mar...@jb...
Date: 2006-05-16 19:38:33 -0400 (Tue, 16 May 2006)
New Revision: 4259
Modified:
labs/jbossrules/trunk/build.xml
Log:
-made javadocs default for build-all
Modified: labs/jbossrules/trunk/build.xml
===================================================================
--- labs/jbossrules/trunk/build.xml 2006-05-16 23:32:23 UTC (rev 4258)
+++ labs/jbossrules/trunk/build.xml 2006-05-16 23:38:33 UTC (rev 4259)
@@ -293,7 +293,7 @@
</target>
- <target name="dist-all" depends="build-all, copy-deps, ydocs, manual, dist-src, dist-bin, dist-bin-withdeps, dist-examples">
+ <target name="dist-all" depends="build-all, copy-deps, javadocs, manual, dist-src, dist-bin, dist-bin-withdeps, dist-examples">
</target>
<target name="dist-examples">
|
|
From: <jbo...@li...> - 2006-05-16 23:32:42
|
Author: mar...@jb... Date: 2006-05-16 19:32:23 -0400 (Tue, 16 May 2006) New Revision: 4258 Added: labs/jbossrules/trunk/build.xml labs/jbossrules/trunk/lib/ labs/jbossrules/trunk/lib/maven-artifact-ant-2.0.4-dep.jar Modified: labs/jbossrules/trunk/documentation/manual/build.xml labs/jbossrules/trunk/drools-compiler/pom.xml labs/jbossrules/trunk/drools-core/pom.xml labs/jbossrules/trunk/drools-decisiontables/pom.xml labs/jbossrules/trunk/drools-jsr94/pom.xml labs/jbossrules/trunk/pom.xml Log: -moved to ant build system Added: labs/jbossrules/trunk/build.xml =================================================================== --- labs/jbossrules/trunk/build.xml 2006-05-16 23:10:59 UTC (rev 4257) +++ labs/jbossrules/trunk/build.xml 2006-05-16 23:32:23 UTC (rev 4258) @@ -0,0 +1,424 @@ +<project name="Drools" basedir="." xmlns:artifact="urn:maven-artifact-ant"> + <property name="version" value="3.0-RC-3"/> + + <target name="init" depends="init-maven"> + <mkdir dir="target/dist" /> + <mkdir dir="target/docs" /> + </target> + + <target name="init-maven"> + <path id="maven.classpath"> + <pathelement location="lib/maven-artifact-ant-2.0.4-dep.jar" /> + </path> + + <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant"> + <classpath refid="maven.classpath"/> + </typedef> + + <artifact:remoteRepository id="jboss.repository" url="http://repository.jboss.com/maven2" /> + + <artifact:remoteRepository id="ibiblio.repository" url="http://www.ibiblio.org/maven2" /> + + <artifact:remoteRepository id="local.repository" url="file://${basedir}/repository" /> + + <artifact:dependencies pathId="parent.dependency.classpath" filesetId="parent.dependency.fileset" verbose="false"> + <pom file="pom.xml"/> + </artifact:dependencies> + + </target> + + <!-- Note this is a hack because maven from ant will not install the parent pom !!!! --> + <target name="install-parent-pom"> + <mkdir dir="${user.home}/.m2/repository/org/drools/drools/${version}" /> + <copy file="pom.xml" tofile="${user.home}/.m2/repository/org/drools/drools/${version}/drools-${version}.pom" /> + </target> + + <target name="compile-core" depends="init,install-parent-pom"> + <antcall target="compile-module"> + <param name="module" value="drools-core"/> + </antcall> + </target> + + <target name="test-core" depends="compile-core"> + <antcall target="test-module"> + <param name="module" value="drools-core"/> + </antcall> + </target> + + <target name="build-core" depends="test-core"> + <antcall target="build-module"> + <param name="module" value="drools-core"/> + </antcall> + </target> + + <target name="clean-core"> + <delete dir="drools-core/target"/> + </target> + + <target name="compile-compiler" depends="build-core"> + <antcall target="compile-module"> + <param name="module" value="drools-compiler"/> + </antcall> + </target> + + <target name="test-compiler" depends="compile-compiler"> + <antcall target="test-module"> + <param name="module" value="drools-compiler"/> + </antcall> + </target> + + <target name="build-compiler" depends="test-compiler"> + <antcall target="build-module"> + <param name="module" value="drools-compiler"/> + </antcall> + </target> + + <target name="clean-compiler"> + <delete dir="drools-target/target"/> + </target> + + <target name="compile-decisiontables" depends="build-compiler"> + <antcall target="compile-module"> + <param name="module" value="drools-decisiontables"/> + </antcall> + </target> + + <target name="test-decisiontables" depends="compile-decisiontables"> + <antcall target="test-module"> + <param name="module" value="drools-decisiontables"/> + </antcall> + </target> + + <target name="build-decisiontables" depends="test-decisiontables"> + <antcall target="build-module"> + <param name="module" value="drools-decisiontables"/> + </antcall> + </target> + + <target name="clean-decisiontables"> + <delete dir="drools-decisiontables/target"/> + </target> + + <target name="compile-jsr94" depends="init"> + <antcall target="compile-module"> + <param name="module" value="drools-jsr94"/> + </antcall> + </target> + + <target name="test-jsr94" depends="compile-jsr94"> + <antcall target="test-module"> + <param name="module" value="drools-jsr94"/> + </antcall> + </target> + + <target name="build-jsr94" depends="test-jsr94"> + <antcall target="build-module"> + <param name="module" value="drools-jsr94"/> + </antcall> + </target> + + <target name="clean-jsr94"> + <delete dir="drools-jsr94/target"/> + </target> + + <target name="compile-all" depends="compile-core, compile-compiler, compile-decisiontables, compile-jsr94"> + </target> + + <target name="test-all" depends="test-core, test-compiler, test-decisiontables, test-jsr94"> + </target> + + <target name="build-all" depends="build-core, build-compiler, build-decisiontables, build-jsr94"> + </target> + + <target name="clean-all" depends="clean-core, clean-compiler, clean-decisiontables, clean-jsr94"> + <delete dir="target" /> + + <delete> + <fileset dir="drools-ide/lib" includes="*"/> + </delete> + + <delete> + <fileset dir="repository" includes="*"/> + </delete> + + </target> + + <target name="compile-module"> + <mkdir dir="${module}/target"/> + <mkdir dir="${module}/target/classes"/> + + <artifact:dependencies pathId="${module}.dependency.classpath" filesetId="${module}.dependency.fileset" verbose="false"> + <pom file="${module}/pom.xml"/> + </artifact:dependencies> + + <copy todir="${module}/target/classes"> + <fileset dir="${module}/src/main/resources"/> + </copy> + + <javac srcdir="${module}/src/main/java" + destdir="${module}/target/classes"> + <classpath> + <path refid="${module}.dependency.classpath" /> + <fileset dir="target"> + <include name="drools-*-{version}.jar"/> + </fileset> + </classpath> + </javac> + </target> + + <target name="test-module" unless="test.skip"> + <mkdir dir="${module}/target/test-classes"/> + <mkdir dir="${module}/target/test-reports"/> + + <artifact:dependencies pathId="${module}.dependency.classpath" filesetId="${module}.dependency.fileset" verbose="false"> + <pom file="${module}/pom.xml"/> + </artifact:dependencies> + + <copy todir="${module}/target/test-classes"> + <fileset dir="${module}/src/test/resources"/> + </copy> + + <javac srcdir="${module}/src/test/java" + destdir="${module}/target/test-classes"> + <classpath> + <path refid="${module}.dependency.classpath" /> + <pathelement location="${module}/target/classes"/> + <fileset dir="target"> + <include name="drools-*-{version}.jar"/> + </fileset> + </classpath> + </javac> + + <junit printsummary="yes" haltonfailure="yes"> + <sysproperty key="jsr94.tck.configuration" value="${module}/target/test-classes/org/drools/jsr94/tck"/> + <classpath> + <path refid="${module}.dependency.classpath"/> + <pathelement location="${module}/target/classes"/> + <pathelement location="${module}/target/test-classes"/> + <fileset dir="target"> + <include name="drools-*-{version}.jar"/> + </fileset> + </classpath> + + <formatter type="plain"/> + + <batchtest fork="no" todir="${module}/target/test-reports"> + <fileset dir="${module}/target/test-classes"> + <include name="**/*Test.class"/> + <exclude name="**/AllTests.class"/> + <exclude name="**/Base*.class"/> + <exclude name="**/ClassLoaderTest.java" /> + <exclude name="**/RuleExecutionSetProviderTest.java" /> + </fileset> + </batchtest> + </junit> + </target> + + <target name="build-module"> + <jar destfile="${module}/target/${module}-${version}.jar" basedir="${module}/target/classes"/> + <copy file="${module}/target/${module}-${version}.jar" todir="target" /> + + <artifact:install file="target/${module}-${version}.jar"> + <pom file="${module}/pom.xml" /> + </artifact:install> + </target> + + <target name="manual" unless="skip.manual"> + <ant dir="documentation/manual" /> + </target> + + <target name="javadocs" unless="skip.javadocs"> + <javadoc + packagenames="org.drools.*" + excludepackagenames="org.drools.asm.*" + destdir="target/docs/apidocs" + author="false" + version="false"> + + <sourcepath> + <pathelement path="drools-core/src/main/java" /> + <pathelement path="drools-compiler/src/main/java" /> + <pathelement path="drools-decisiontables/src/main/java" /> + </sourcepath> + + <classpath> + <fileset dir="."> + <include name="target/drools-*.jar" /> + </fileset> + </classpath> + </javadoc> + </target> + + <target name="ydocs" unless="skip.javadocs"> + <javadoc + packagenames="org.drools.*" + excludepackagenames="org.drools.asm.*" + destdir="target/docs/apidocs" + author="false" + version="false"> + + <sourcepath> + <pathelement path="drools-core/src/main/java" /> + <pathelement path="drools-compiler/src/main/java" /> + <pathelement path="drools-decisiontables/src/main/java" /> + </sourcepath> + + <classpath> + <fileset dir="."> + <include name="target/drools-*.jar" /> + </fileset> + </classpath> + + <doclet name="ydoc.doclets.YStandard"> + <path> + <pathelement location="./ydoc/lib/ydoc.jar" /> + <pathelement location="./ydoc/lib/class2svg.jar" /> + <pathelement location="./ydoc/lib/styleed.jar" /> + <pathelement location="./ydoc/resources"/> + </path> + + <param name="-generic" value=""/> + <param name="-umlautogen" value=""/> + <param name="-filter" value="ydoc.filters.ExcludeFilter"/> + <param name="-tag" value="y.precondition"/> + <param name="-tag" value="y.postcondition"/> + <param name="-tag" value="y.complexity"/> + <param name="-tag" value="param"/> + <param name="-tag" value="return"/> + <param name="-tag" value="see"/> + <param name="-tag" value="y.uml"/> + <param name="-breakiterator"/> + </doclet> + </javadoc> + </target> + + + <target name="dist-all" depends="build-all, copy-deps, ydocs, manual, dist-src, dist-bin, dist-bin-withdeps, dist-examples"> + </target> + + <target name="dist-examples"> + <delete> + <fileset dir="drools-examples/log" includes="*"/> + </delete> + + <zip destfile="target/dist/drools-examples-${version}-src.zip"> + <zipfileset dir="." + includes="drools-examples/**" + excludes="drools-examples/target/**"/> + </zip> + </target> + + <target name="dist-src"> + <zip destfile="target/dist/drools-${version}-src.zip"> + <zipfileset dir="." + includes="*.xml" /> + <zipfileset dir="." + includes="drools-core/**" + excludes="drools-core/target/**" /> + <zipfileset dir="." + includes="drools-compiler/**" + excludes="drools-compiler/target/**" /> + <zipfileset dir="." + includes="drools-decisiontables/**" + excludes="drools-decisiontables/target/**" /> + <zipfileset dir="." + includes="drools-jsr94/**" + excludes="drools-jsr94/target/**" /> + <zipfileset dir="." + includes="drools-ide/**" + excludes="drools-ide/bin/** drools-ide/lib/**" /> + <zipfileset dir="." + includes="drools-examples/**" + excludes="drools-examples/target/**" /> + <zipfileset dir="." + includes="documentation/manual/**" + excludes="documentation/manual/build/**" /> + </zip> + </target> + + <target name="dist-bin"> + <zip destfile="target/dist/drools-${version}-bin.zip"> + <zipfileset dir="target/docs" + prefix="docs" /> + + <zipfileset dir="documentation/manual/build/en/shared" + excludes="**/*.svg **/*.db" + prefix="docs/shared" /> + + <zipfileset dir="documentation/manual/build/en/html_single" + prefix="docs/html_single" /> + + <zipfileset dir="documentation/manual/build/en/html" + prefix="docs/html" /> + + <zipfileset dir="target" + includes="**/drools-*.jar" /> + </zip> + </target> + + <target name="dist-bin-withdeps"> + <zip destfile="target/dist/drools-${version}-bin-withdeps.zip"> + + <zipfileset dir="target/docs" + prefix="docs" /> + + <zipfileset dir="documentation/manual/build/en/shared" + excludes="**/*.svg **/*.db" + prefix="docs/shared" /> + + <zipfileset dir="documentation/manual/build/en/html_single" + prefix="docs/html_single" /> + + <zipfileset dir="documentation/manual/build/en/html" + prefix="docs/html" /> + + <zipfileset dir="target" + includes="**/drools-*.jar" /> + + <zipfileset dir="drools-ide/lib" + includes="**/*.jar" + excludes="**/drools-*.jar" + prefix="lib" /> + </zip> + + </target> + + <target name="copy-deps" depends="init-maven"> + <artifact:dependencies filesetId="drools-core.dependency.fileset" verbose="false"> + <pom file="drools-core/pom.xml"/> + </artifact:dependencies> + + <artifact:dependencies filesetId="drools-compiler.dependency.fileset" verbose="false"> + <pom file="drools-compiler/pom.xml"/> + </artifact:dependencies> + + <artifact:dependencies filesetId="drools-decisiontables.dependency.fileset" verbose="false"> + <pom file="drools-decisiontables/pom.xml"/> + </artifact:dependencies> + + <artifact:dependencies filesetId="drools-jsr94.dependency.fileset" verbose="false"> + <pom file="drools-jsr94/pom.xml"/> + </artifact:dependencies> + + <copy todir="repository"> + <fileset refid="parent.dependency.fileset"/> + <fileset refid="drools-core.dependency.fileset"/> + <fileset refid="drools-compiler.dependency.fileset"/> + <fileset refid="drools-decisiontables.dependency.fileset"/> + <fileset refid="drools-jsr94.dependency.fileset"/> + </copy> + + <delete> + <fileset dir="drools-ide/lib" includes="*"/> + </delete> + + <copy todir="drools-ide/lib" + flatten="true"> + <fileset dir="repository" includes="**/*.jar" excludes="**/jsr94-sigtest-1.1.jar **/jsr94-tck-1.0.3.jar" /> + </copy> + </target> + + + + +</project> \ No newline at end of file Modified: labs/jbossrules/trunk/documentation/manual/build.xml =================================================================== --- labs/jbossrules/trunk/documentation/manual/build.xml 2006-05-16 23:10:59 UTC (rev 4257) +++ labs/jbossrules/trunk/documentation/manual/build.xml 2006-05-16 23:32:23 UTC (rev 4258) @@ -66,10 +66,10 @@ <target name="lang.all"> <!-- Compile the documentation for a single language in all formats. --> <antcall target="lang.misc"/> - <antcall target="lang.docpdf"/> + <!--antcall target="lang.docpdf"/--> <antcall target="lang.dochtml"/> <antcall target="lang.dochtmlsingle"/> - <antcall target="lang.doceclipse"/> + <!--antcall target="lang.doceclipse"/--> </target> <target name="lang.docpdf.prepare"> Modified: labs/jbossrules/trunk/drools-compiler/pom.xml =================================================================== --- labs/jbossrules/trunk/drools-compiler/pom.xml 2006-05-16 23:10:59 UTC (rev 4257) +++ labs/jbossrules/trunk/drools-compiler/pom.xml 2006-05-16 23:32:23 UTC (rev 4258) @@ -2,7 +2,7 @@ <parent> <artifactId>drools</artifactId> <groupId>org.drools</groupId> - <version>3.0-RC-2</version> + <version>3.0-RC-3</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -10,7 +10,7 @@ <artifactId>drools-compiler</artifactId> <name>Drools :: Compiler</name> - <version>3.0-RC-2</version> + <version>3.0-RC-3</version> <repositories> <repository> @@ -30,20 +30,14 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-jci-janino</artifactId> - <version>2.4.1</version> + <version>2.4.3</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-jci-eclipse</artifactId> - <version>3.2.0.658</version> - </dependency> - - <dependency> - <groupId>janino</groupId> - <artifactId>janino</artifactId> - <version>2.4.1</version> - </dependency> + <version>3.2.0.666</version> + </dependency> <!-- only needed for the default expander in parser/lang.. to remove when it is refactored into another module. --> <dependency> Modified: labs/jbossrules/trunk/drools-core/pom.xml =================================================================== --- labs/jbossrules/trunk/drools-core/pom.xml 2006-05-16 23:10:59 UTC (rev 4257) +++ labs/jbossrules/trunk/drools-core/pom.xml 2006-05-16 23:32:23 UTC (rev 4258) @@ -2,7 +2,7 @@ <parent> <artifactId>drools</artifactId> <groupId>org.drools</groupId> - <version>3.0-RC-2</version> + <version>3.0-RC-3</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -10,7 +10,7 @@ <artifactId>drools-core</artifactId> <name>Drools :: Rete-OO Core</name> - <version>3.0-RC-2</version> + <version>3.0-RC-3</version> <repositories> <repository> Modified: labs/jbossrules/trunk/drools-decisiontables/pom.xml =================================================================== --- labs/jbossrules/trunk/drools-decisiontables/pom.xml 2006-05-16 23:10:59 UTC (rev 4257) +++ labs/jbossrules/trunk/drools-decisiontables/pom.xml 2006-05-16 23:32:23 UTC (rev 4258) @@ -2,7 +2,7 @@ <parent> <artifactId>drools</artifactId> <groupId>org.drools</groupId> - <version>3.0-RC-2</version> + <version>3.0-RC-3</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -10,7 +10,7 @@ <artifactId>drools-decisiontables</artifactId> <name>Drools :: Decision Tables</name> - <version>3.0-RC-2</version> + <version>3.0-RC-3</version> <repositories> <repository> @@ -23,7 +23,7 @@ <dependency> <groupId>poi</groupId> <artifactId>poi</artifactId> - <version>2.5.1</version> + <version>2.5.1-final-20040804</version> </dependency> <dependency> <groupId>org.drools</groupId> Modified: labs/jbossrules/trunk/drools-jsr94/pom.xml =================================================================== --- labs/jbossrules/trunk/drools-jsr94/pom.xml 2006-05-16 23:10:59 UTC (rev 4257) +++ labs/jbossrules/trunk/drools-jsr94/pom.xml 2006-05-16 23:32:23 UTC (rev 4258) @@ -2,7 +2,7 @@ <parent> <artifactId>drools</artifactId> <groupId>org.drools</groupId> - <version>3.0-RC-2</version> + <version>3.0-RC-3</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -10,7 +10,7 @@ <artifactId>drools-jsr94</artifactId> <name>Drools :: JSR-94 API Module</name> - <version>3.0-RC-2</version> + <version>3.0-RC-3</version> <repositories> <repository> Added: labs/jbossrules/trunk/lib/maven-artifact-ant-2.0.4-dep.jar =================================================================== (Binary files differ) Property changes on: labs/jbossrules/trunk/lib/maven-artifact-ant-2.0.4-dep.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: labs/jbossrules/trunk/pom.xml =================================================================== --- labs/jbossrules/trunk/pom.xml 2006-05-16 23:10:59 UTC (rev 4257) +++ labs/jbossrules/trunk/pom.xml 2006-05-16 23:32:23 UTC (rev 4258) @@ -4,7 +4,7 @@ <artifactId>drools</artifactId> <packaging>pom</packaging> <name>Drools</name> - <version>3.0-RC-2</version> + <version>3.0-RC-3</version> <issueManagement> <system>jira</system> @@ -51,135 +51,39 @@ <developers> <developer> - <name>Bob McWhirter</name> - <id>bob</id> - <email>bo...@we...</email> - <organization>The Werken Company</organization> - <roles> - <role>Founder</role> - <role>Lead Developer</role> - </roles> - </developer> - <developer> <name>Mark Proctor</name> - <id>mark</id> - <email>mpr...@co...</email> - <organization>Codehaus</organization> + <id>5</id> + <email>mar...@jb...</email> <roles> - <role>Lead Developer</role> + <role>Project Lead</role> </roles> - </developer> + <timezone>0</timezone> + <organization>JBoss Inc.</organization> + </developer> + <developer> - <name>James Strachan</name> - <id>jstrachan</id> - <email>jam...@ya...</email> - <organization>Spiritsoft</organization> + <name>Michael Neale</name> + <id>5</id> + <email>mic...@gm...</email> <roles> - <role>Pontificator</role> - </roles> - </developer> - <developer> - <name>David Cramer</name> - <id>dcramer</id> - <email>da...@fa...</email> - <roles> - <role>Instigator</role> - </roles> - </developer> - <developer> - <name>Martin Hald</name> - <id>mhald</id> - <email>mar...@bi...</email> - <roles> <role>Developer</role> </roles> + <timezone>+10</timezone> + <organization>JBoss Inc.</organization> </developer> + <developer> - <name>Pete Kazmier</name> - <id>kaz</id> - <email>pet...@ka...</email> + <name>Bob McWhirter</name> + <id>bob</id> + <email>bo...@we...</email> + <organization>The Werken Company</organization> <roles> - <role>Developer</role> + <role>Founder</role> </roles> </developer> + + <developer> - <name>James Roome</name> - <id>0</id> - <email>re...@ho...</email> - <roles> - <role>Developer</role> - </roles> - </developer> - <developer> - <name>Christiaan ten Klooster</name> - <id>1</id> - <email>chr...@da...</email> - <roles> - <role>Developer</role> - </roles> - </developer> - <developer> - <name>Tom Vasak</name> - <id>2</id> - <email>to...@ai...</email> - <roles> - <role>Developer</role> - </roles> - </developer> - <developer> - <name>Matt Ho</name> - <id>savaki</id> - <email>ma...@in...</email> - <organization>Indigo Egg</organization> - <roles> - <role>Developer</role> - </roles> - </developer> - <developer> - <name>Thomas Diesler</name> - <id>tdiesler</id> - <email>tho...@so...</email> - <roles> - <role>JCA Lead</role> - </roles> - </developer> - <developer> - <name>Robert Searle</name> - <id>3</id> - <email>Rob...@ho...</email> - <roles> - <role>Developer</role> - </roles> - </developer> - <developer> - <name>N. Alex Rupp</name> - <id>4</id> - <email>al...@nr...</email> - <roles> - <role>JSR-94 Lead</role> - </roles> - </developer> - <developer> - <name>Andy Barnett</name> - <id>dbarnett</id> - <email>aba...@ca...</email> - <roles> - <role>Developer</role> - </roles> - <timezone>-5</timezone> - <organization>Cantilever Technologies</organization> - </developer> - <developer> - <name>Michael Neale</name> - <id>5</id> - <email>mic...@gm...</email> - <roles> - <role>Developer</role> - </roles> - <timezone>+10</timezone> - <organization>JBoss Inc.</organization> - </developer> - <developer> <name>Edson Tirelli</name> <id>tirelli</id> <email>ti...@po...</email> @@ -204,11 +108,6 @@ <repositories> <repository> - <id>apache</id> - <url>http://cvs.apache.org/maven-snapshot-repository/</url> - </repository> - - <repository> <id>ibiblio</id> <url>http://www.ibiblio.org/maven2/</url> </repository> @@ -267,6 +166,17 @@ <build> <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.0-beta-1</version> + <configuration> + <descriptor>bin.xml</descriptor> + <finalName>final_name</finalName> + <outputDirectory>output/directory</outputDirectory> + <workDirectory>target/assembly/work</workDirectory> + </configuration> + </plugin> + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>dependency-maven-plugin</artifactId> |
Author: adamw Date: 2006-05-16 19:10:59 -0400 (Tue, 16 May 2006) New Revision: 4257 Added: labs/shotoku/trunk/lib/jboss/activation.jar labs/shotoku/trunk/lib/jboss/javax.servlet.jar labs/shotoku/trunk/lib/jboss/javax.servlet.jsp.jar labs/shotoku/trunk/lib/jboss/jboss-annotations-ejb3.jar labs/shotoku/trunk/lib/jboss/jboss-aop.jar labs/shotoku/trunk/lib/jboss/jboss-common.jar labs/shotoku/trunk/lib/jboss/jboss-ejb3.jar labs/shotoku/trunk/lib/jboss/jboss-ejb3x.jar labs/shotoku/trunk/lib/jboss/jboss-j2ee.jar labs/shotoku/trunk/lib/jboss/jboss-jmx.jar labs/shotoku/trunk/lib/jboss/jboss-system.jar labs/shotoku/trunk/lib/portal/ labs/shotoku/trunk/lib/portal/portal-cms-lib.jar labs/shotoku/trunk/lib/portal/portal-common-lib.jar labs/shotoku/trunk/lib/portal/portal-core-lib.jar labs/shotoku/trunk/lib/taglibs/jstl.jar labs/shotoku/trunk/lib/taglibs/standard.jar labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/cache/ShotokuPropertiesWatcher.java labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/tools/KeyValue.java labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/FeedsConfigurationWatcher.java labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/data/ labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/data/AtomFeed.java labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/data/Feed.java labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/data/FileBasedFeed.java labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/data/InformaBasedFeed.java labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/data/RdfFeed.java labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/data/RomeBasedFeed.java labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/data/Rss2Feed.java labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/tools/ labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/tools/RdfDateFormat.java labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/tools/TextEscaping.java labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/variables/MultiValueMultiVariableResolver.java labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/variables/NullVariableResolver.java labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/variables/XmlNodeTypeVariableResolver.java labs/shotoku/trunk/shotoku-svn/lib/javasvn.jar Removed: labs/shotoku/trunk/lib/jboss/jars/ labs/shotoku/trunk/lib/taglibs/jars/ labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/AtomFeed.java labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/Feed.java labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/FileBasedFeed.java labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/InformaBasedFeed.java labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/RdfDateFormat.java labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/RdfFeed.java labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/RomeBasedFeed.java labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/Rss2Feed.java labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/TextEscaping.java labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/variables/TypeVariableResolver.java labs/shotoku/trunk/shotoku-portal/lib/ labs/shotoku/trunk/shotoku-svn/lib/tmate/ Modified: labs/shotoku/trunk/maven.xml labs/shotoku/trunk/project.properties labs/shotoku/trunk/shotoku-base/src/etc/shotoku.properties.sample labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/ContentManager.java labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/FeedFactory.java labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/FeedsCache.java labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/FeedsDescriptor.java labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/FeedsServlet.java labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/variables/MultiValueVariableResolver.java labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/variables/Substitution.java labs/shotoku/trunk/shotoku-feeds/src/web/WEB-INF/web.xml labs/shotoku/trunk/shotoku-portal/project.properties labs/shotoku/trunk/shotoku-svn/maven.xml labs/shotoku/trunk/shotoku-svn/project.properties Log: http://jira.jboss.com/jira/browse/JBSHOTOKU-36 Added: labs/shotoku/trunk/lib/jboss/activation.jar =================================================================== (Binary files differ) Property changes on: labs/shotoku/trunk/lib/jboss/activation.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: labs/shotoku/trunk/lib/jboss/javax.servlet.jar =================================================================== (Binary files differ) Property changes on: labs/shotoku/trunk/lib/jboss/javax.servlet.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: labs/shotoku/trunk/lib/jboss/javax.servlet.jsp.jar =================================================================== (Binary files differ) Property changes on: labs/shotoku/trunk/lib/jboss/javax.servlet.jsp.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: labs/shotoku/trunk/lib/jboss/jboss-annotations-ejb3.jar =================================================================== (Binary files differ) Property changes on: labs/shotoku/trunk/lib/jboss/jboss-annotations-ejb3.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: labs/shotoku/trunk/lib/jboss/jboss-aop.jar =================================================================== (Binary files differ) Property changes on: labs/shotoku/trunk/lib/jboss/jboss-aop.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: labs/shotoku/trunk/lib/jboss/jboss-common.jar =================================================================== (Binary files differ) Property changes on: labs/shotoku/trunk/lib/jboss/jboss-common.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: labs/shotoku/trunk/lib/jboss/jboss-ejb3.jar =================================================================== (Binary files differ) Property changes on: labs/shotoku/trunk/lib/jboss/jboss-ejb3.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: labs/shotoku/trunk/lib/jboss/jboss-ejb3x.jar =================================================================== (Binary files differ) Property changes on: labs/shotoku/trunk/lib/jboss/jboss-ejb3x.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: labs/shotoku/trunk/lib/jboss/jboss-j2ee.jar =================================================================== (Binary files differ) Property changes on: labs/shotoku/trunk/lib/jboss/jboss-j2ee.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: labs/shotoku/trunk/lib/jboss/jboss-jmx.jar =================================================================== (Binary files differ) Property changes on: labs/shotoku/trunk/lib/jboss/jboss-jmx.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: labs/shotoku/trunk/lib/jboss/jboss-system.jar =================================================================== (Binary files differ) Property changes on: labs/shotoku/trunk/lib/jboss/jboss-system.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: labs/shotoku/trunk/lib/portal/portal-cms-lib.jar =================================================================== (Binary files differ) Property changes on: labs/shotoku/trunk/lib/portal/portal-cms-lib.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: labs/shotoku/trunk/lib/portal/portal-common-lib.jar =================================================================== (Binary files differ) Property changes on: labs/shotoku/trunk/lib/portal/portal-common-lib.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: labs/shotoku/trunk/lib/portal/portal-core-lib.jar =================================================================== (Binary files differ) Property changes on: labs/shotoku/trunk/lib/portal/portal-core-lib.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: labs/shotoku/trunk/lib/taglibs/jstl.jar =================================================================== (Binary files differ) Property changes on: labs/shotoku/trunk/lib/taglibs/jstl.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: labs/shotoku/trunk/lib/taglibs/standard.jar =================================================================== (Binary files differ) Property changes on: labs/shotoku/trunk/lib/taglibs/standard.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: labs/shotoku/trunk/maven.xml =================================================================== --- labs/shotoku/trunk/maven.xml 2006-05-16 20:46:01 UTC (rev 4256) +++ labs/shotoku/trunk/maven.xml 2006-05-16 23:10:59 UTC (rev 4257) @@ -60,7 +60,7 @@ </ant:fileset> </ant:copy> - <!-- Copying the ear to the deploy directory. --> + <!-- Copying the sar to the deploy directory. --> <ant:copy todir="${local.deploy.dir}"> <ant:fileset dir="target" flatten="true" overwrite="true"> <ant:filename name="${shotoku.sar.dir}/**" /> Modified: labs/shotoku/trunk/project.properties =================================================================== --- labs/shotoku/trunk/project.properties 2006-05-16 20:46:01 UTC (rev 4256) +++ labs/shotoku/trunk/project.properties 2006-05-16 23:10:59 UTC (rev 4257) @@ -11,21 +11,25 @@ maven.jar.override=on -maven.jar.activation=${shotoku.root.dir}lib/jboss/jars/activation.jar -maven.jar.javax.servlet=${shotoku.root.dir}lib/jboss/jars/javax.servlet.jar -maven.jar.javax.servlet.jsp=${shotoku.root.dir}lib/jboss/jars/javax.servlet.jsp.jar -maven.jar.jboss-aop=${shotoku.root.dir}lib/jboss/jars/jboss-aop.jar -maven.jar.jboss-annotations-ejb3=${shotoku.root.dir}lib/jboss/jars/jboss-annotations-ejb3.jar -maven.jar.jboss-ejb3=${shotoku.root.dir}lib/jboss/jars/jboss-ejb3.jar -maven.jar.jboss-ejb3x=${shotoku.root.dir}lib/jboss/jars/jboss-ejb3x.jar -maven.jar.jboss-j2ee=${shotoku.root.dir}lib/jboss/jars/jboss-j2ee.jar -maven.jar.jboss-jmx=${shotoku.root.dir}lib/jboss/jars/jboss-jmx.jar -maven.jar.jboss-system=${shotoku.root.dir}lib/jboss/jars/jboss-system.jar -maven.jar.jboss-common=${shotoku.root.dir}lib/jboss/jars/jboss-common.jar +maven.jar.activation=${shotoku.root.dir}lib/jboss/activation.jar +maven.jar.javax.servlet=${shotoku.root.dir}lib/jboss/javax.servlet.jar +maven.jar.javax.servlet.jsp=${shotoku.root.dir}lib/jboss/javax.servlet.jsp.jar +maven.jar.jboss-aop=${shotoku.root.dir}lib/jboss/jboss-aop.jar +maven.jar.jboss-annotations-ejb3=${shotoku.root.dir}lib/jboss/jboss-annotations-ejb3.jar +maven.jar.jboss-ejb3=${shotoku.root.dir}lib/jboss/jboss-ejb3.jar +maven.jar.jboss-ejb3x=${shotoku.root.dir}lib/jboss/jboss-ejb3x.jar +maven.jar.jboss-j2ee=${shotoku.root.dir}lib/jboss/jboss-j2ee.jar +maven.jar.jboss-jmx=${shotoku.root.dir}lib/jboss/jboss-jmx.jar +maven.jar.jboss-system=${shotoku.root.dir}lib/jboss/jboss-system.jar +maven.jar.jboss-common=${shotoku.root.dir}lib/jboss/jboss-common.jar -maven.jar.standard=${shotoku.root.dir}lib/taglibs/jars/standard.jar -maven.jar.jstl=${shotoku.root.dir}lib/taglibs/jars/jstl.jar +maven.jar.standard=${shotoku.root.dir}lib/taglibs/standard.jar +maven.jar.jstl=${shotoku.root.dir}lib/taglibs/jstl.jar +maven.jar.portal-cms=${shotoku.root.dir}lib/portal/portal-cms-lib.jar +maven.jar.portal-core=${shotoku.root.dir}lib/portal/portal-core-lib.jar +maven.jar.portal-common=${shotoku.root.dir}lib/portal/portal-common-lib.jar + maven.jar.shotoku-base=${shotoku.root.dir}shotoku-base/target/shotoku-base.jar maven.jar.shotoku-svn=${shotoku.root.dir}shotoku-svn/target/shotoku-svn.jar maven.jar.shotoku-aop=${shotoku.root.dir}shotoku-aop/target/shotoku-aop.jar Modified: labs/shotoku/trunk/shotoku-base/src/etc/shotoku.properties.sample =================================================================== --- labs/shotoku/trunk/shotoku-base/src/etc/shotoku.properties.sample 2006-05-16 20:46:01 UTC (rev 4256) +++ labs/shotoku/trunk/shotoku-base/src/etc/shotoku.properties.sample 2006-05-16 23:10:59 UTC (rev 4257) @@ -24,6 +24,12 @@ shotoku.embedded = false +# Feeds configuration + +# Content manager and directory in which feeds.properties is placed in shotoku +shotoku.internal.feeds.configcmid = +shotoku.internal.feeds.configdir = + # Internal properties (best leave intact) shotoku.transfer.buffer.size = 1024 Modified: labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/ContentManager.java =================================================================== --- labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/ContentManager.java 2006-05-16 20:46:01 UTC (rev 4256) +++ labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/ContentManager.java 2006-05-16 23:10:59 UTC (rev 4257) @@ -746,7 +746,7 @@ /** * Gets a property of this content manager, as it is written in the * configuration file (helper method for implementations). Only internal - * properties! (long parameter value). + * properties! (int parameter value). * * @param name * Name of the property to get. Added: labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/cache/ShotokuPropertiesWatcher.java =================================================================== --- labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/cache/ShotokuPropertiesWatcher.java 2006-05-16 20:46:01 UTC (rev 4256) +++ labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/cache/ShotokuPropertiesWatcher.java 2006-05-16 23:10:59 UTC (rev 4257) @@ -0,0 +1,40 @@ +package org.jboss.shotoku.cache; + +import org.jboss.shotoku.exceptions.ResourceDoesNotExist; + +import java.util.Properties; +import java.util.Map; +import java.io.IOException; + +/** + * @author Adam Warski (ad...@as...) + */ +public abstract class ShotokuPropertiesWatcher<K> extends ShotokuResourceWatcher<K, Properties> { + protected abstract String getConfigFileName(); + + private Properties getProperties(K key) { + try { + Properties ret = new Properties(); + ret.load(getContentManager(key).getNode( + getConfigFileName()).getContentInputStream()); + return ret; + } catch (IOException e) { + e.printStackTrace(); + } catch (ResourceDoesNotExist e) { + // Well ... + e.printStackTrace(); + } + + return null; + } + + public Properties init(K key) { + addWatchedPath(key, getConfigFileName()); + return getProperties(key); + } + + protected void update(K key, Properties currentObject, + Map<String, ChangeType> changes) { + put(key, getProperties(key)); + } +} Added: labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/tools/KeyValue.java =================================================================== --- labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/tools/KeyValue.java 2006-05-16 20:46:01 UTC (rev 4256) +++ labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/tools/KeyValue.java 2006-05-16 23:10:59 UTC (rev 4257) @@ -0,0 +1,39 @@ +package org.jboss.shotoku.tools; + +/** + * A pair of objects, but only the first one is considered in the equals() + * and hashCode() methods. + * @param <T1> + * @param <T2> + * @author Adam Warski (ad...@as...) + */ +public class KeyValue<T1, T2> { + private T1 obj1; + private T2 obj2; + + public KeyValue(T1 obj1, T2 obj2) { + this.obj1 = obj1; + this.obj2 = obj2; + } + + public T1 getFirst() { + return obj1; + } + + public T2 getSecond() { + return obj2; + } + + public boolean equals(Object o) { + if (o instanceof KeyValue) { + KeyValue p = (KeyValue) o; + return p.getFirst().equals(obj1); + } + + return false; + } + + public int hashCode() { + return obj1.hashCode(); + } +} Deleted: labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/AtomFeed.java =================================================================== --- labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/AtomFeed.java 2006-05-16 20:46:01 UTC (rev 4256) +++ labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/AtomFeed.java 2006-05-16 23:10:59 UTC (rev 4257) @@ -1,43 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.shotoku.feeds; - -import java.io.File; -import java.io.IOException; - -import com.sun.syndication.feed.synd.SyndFeed; - -public class AtomFeed extends RomeBasedFeed { - public AtomFeed(File file) throws IOException { - super(file); - } - - @Override - protected void setFeedType(SyndFeed feed) { - feed.setFeedType("atom_0.3"); - } - - @Override - protected String getContentType() { - return "application/atom+xml"; - } -} Deleted: labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/Feed.java =================================================================== --- labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/Feed.java 2006-05-16 20:46:01 UTC (rev 4256) +++ labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/Feed.java 2006-05-16 23:10:59 UTC (rev 4257) @@ -1,79 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.shotoku.feeds; - -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.Writer; -import java.net.URL; - -import javax.servlet.http.HttpServletResponse; - -/** - * An interface that should be implemented by classes representing data feeds. - * @author adamw - */ -public interface Feed { - /** - * Writes the feed data to the given output stream. - * @param os Output stream to write to. - * @throws IOException - */ - public void write(OutputStream os) throws IOException; - /** - * Writes the feed data to the given http servlet response, setting an - * appropriate content type. - * @param response Response to write to. - * @throws IOException - */ - public void write(HttpServletResponse response) throws IOException; - /** - * Generates a feed getting data from the given url. - * @param url Url from which to get the content. - */ - public void generate(URL url) throws IOException; - /** - * Generates a feed getting data from the given input stream. - * @param is Input stream from which to get the content. - * @throws IOException - */ - public void generate(InputStream is) throws IOException; - /** - * Gets a writer to which content of this feed can be written. - * @return A writer for writing content of this feed. - */ - public Writer getWriter() throws IOException; - /** - * Generates a feed using the given feeds. - * @param feeds Feeds which should be aggregated into a single - * feed. - */ - public void generate(Feed[] feeds, String title, - String description, String author, String link) - throws IllegalArgumentException, IOException; - /** - * Gets an input stream of this feed. - * @return Input stream of this feed. - */ - public InputStream getInputStream(); -} Modified: labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/FeedFactory.java =================================================================== --- labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/FeedFactory.java 2006-05-16 20:46:01 UTC (rev 4256) +++ labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/FeedFactory.java 2006-05-16 23:10:59 UTC (rev 4257) @@ -21,6 +21,11 @@ */ package org.jboss.shotoku.feeds; +import org.jboss.shotoku.feeds.data.AtomFeed; +import org.jboss.shotoku.feeds.data.Feed; +import org.jboss.shotoku.feeds.data.RdfFeed; +import org.jboss.shotoku.feeds.data.Rss2Feed; + import java.io.File; import java.util.HashMap; import java.util.Map; @@ -35,7 +40,7 @@ * <code>feedClasses</code> - map feed type -> feed class. */ private static Map<String, Class> feedClasses; - private static Random random; + private static final Random random; static { feedClasses = new HashMap<String, Class>(); @@ -51,7 +56,7 @@ * @param type Type of feed to create. * @return A new instance of a feed of the given type. */ - public static Feed getNewFeed(String type) { + public static Feed getNewFeed(String name, String displayName, String type) { Class feedClass = feedClasses.get(type); if (feedClass == null) return null; @@ -61,9 +66,10 @@ } try { - File file = File.createTempFile(FeedsDescriptor.FEEDS_FILE_PREFIX + nextInt, type); - return (Feed) feedClass.getConstructor(new Class[] { File.class }). - newInstance(new Object[] { file }); + File file = File.createTempFile("shotoku-feeds" + nextInt, type); + return (Feed) feedClass.getConstructor( + String.class, String.class, String.class, File.class).newInstance( + name, displayName, type, file); } catch (Exception e) { return null; } Modified: labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/FeedsCache.java =================================================================== --- labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/FeedsCache.java 2006-05-16 20:46:01 UTC (rev 4256) +++ labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/FeedsCache.java 2006-05-16 23:10:59 UTC (rev 4257) @@ -31,6 +31,7 @@ public void update(Pair<String, String> key, FeedsDescriptor currentObject) { put(key, getDesc(key.getFirst(), key.getSecond())); + currentObject.release(); } public FeedsDescriptor init(Pair<String, String> key) { Added: labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/FeedsConfigurationWatcher.java =================================================================== --- labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/FeedsConfigurationWatcher.java 2006-05-16 20:46:01 UTC (rev 4256) +++ labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/FeedsConfigurationWatcher.java 2006-05-16 23:10:59 UTC (rev 4257) @@ -0,0 +1,18 @@ +package org.jboss.shotoku.feeds; + +import org.jboss.shotoku.cache.ShotokuPropertiesWatcher; +import org.jboss.shotoku.ContentManager; +import org.jboss.shotoku.tools.Pair; + +/** + * @author Adam Warski (ad...@as...) + */ +public class FeedsConfigurationWatcher extends ShotokuPropertiesWatcher<Pair<String, String>> { + protected String getConfigFileName() { + return "feeds.properties"; + } + + protected ContentManager initContentManager(Pair<String, String> key) { + return ContentManager.getContentManager(key.getFirst(), key.getSecond()); + } +} Modified: labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/FeedsDescriptor.java =================================================================== --- labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/FeedsDescriptor.java 2006-05-16 20:46:01 UTC (rev 4256) +++ labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/FeedsDescriptor.java 2006-05-16 23:10:59 UTC (rev 4257) @@ -25,6 +25,7 @@ import java.io.Writer; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; +import java.lang.reflect.Constructor; import java.net.URL; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -39,18 +40,28 @@ import java.util.Map; import java.util.Properties; import java.util.Set; +import java.util.regex.Pattern; +import java.util.regex.Matcher; import org.apache.velocity.VelocityContext; import org.apache.xerces.parsers.DOMParser; import org.jboss.shotoku.tools.XmlTools; import org.jboss.logging.Logger; import org.jboss.shotoku.ContentManager; +import org.jboss.shotoku.feeds.data.Feed; +import org.jboss.shotoku.feeds.tools.RdfDateFormat; +import org.jboss.shotoku.feeds.tools.TextEscaping; +import org.jboss.shotoku.feeds.variables.VariableResolver; +import org.jboss.shotoku.feeds.variables.NullVariableResolver; +import org.jboss.shotoku.feeds.variables.Substitution; import org.jboss.shotoku.tools.Pair; +import org.jboss.shotoku.tools.Tools; import org.jboss.shotoku.aop.CacheItem; import org.jboss.shotoku.search.Search; import org.jboss.shotoku.search.SearchParameter; import org.w3c.dom.Node; import org.w3c.dom.NodeList; +import org.w3c.dom.NamedNodeMap; import org.xml.sax.InputSource; import org.xml.sax.SAXException; @@ -62,115 +73,160 @@ * @author da...@si... */ public class FeedsDescriptor { - private static final Logger log = Logger.getLogger(FeedsDescriptor.class); +/* +# Shotoku feeds properites - search parameters classes +search.shotoku-feed = org.jboss.shotoku.search.Search - /** - * <code>FEEDS_DIRECTORY</code> - shotoku directory in which feed - * definitions are stored. - */ - protected final static String FEEDS_DIRECTORY = "descriptors"; +search.and = org.jboss.shotoku.search.AndNodeFilter +search.or = org.jboss.shotoku.search.OrNodeFilter +search.property-value = org.jboss.shotoku.search.PropertyValueParameter - /** - * <code>FEEDS_NODE_ENDING</code> - node with names ending with this - * string are parsed and feed definitons are read from them. - */ - private final static String FEEDS_NODE_ENDING = "-feeds.xml"; +search.directory = org.jboss.shotoku.search.DirectoryIncludeParameter +search.history = org.jboss.shotoku.search.HistoryIncludeParameter +search.limit = org.jboss.shotoku.search.LimitParameter +search.property-sort = org.jboss.shotoku.search.PropertySortParameter +search.date-sort = org.jboss.shotoku.search.DateSortParameter - private final static String REM_FEED_TAG = "remote-feed"; +search.search = org.jboss.shotoku.search.Search - private final static String AGG_FEED_TAG = "aggregated-feed"; +search.parametrized = directory,history,limit,property-sort,property-value +*/ - private final static String SHO_FEED_TAG = "shotoku-feed"; + private class FeedDefinition { + FeedDefinition(String group, Node definition) { + this.group = group; + this.definition = definition; + } - private final static String SHOTOKU_CONFIG = "shotoku-config.properties"; + String group; + Node definition; + } - private final static String ALL_TOKENS = "*"; + private static final Logger log = Logger.getLogger(FeedsDescriptor.class); - private final static String TOKENS_DELIMITER = ","; + /** + * Node with names ending with this string are parsed and + * feed definitons are read from them. + */ + private final static String NODE_ENDING = "-feeds.xml"; - private final static String TYPE_PARAM = "${type}"; + /* + * Tag names. + */ + private final static String REM_FEED_TAG = "remote-feed"; + private final static String AGG_FEED_TAG = "aggregated-feed"; + private final static String SHO_FEED_TAG = "shotoku-feed"; - private final static String SITE_PARAM = "${site}"; + /* + * Property name, under which content manager id and name of the + * directory which contains the configuration file can be found. + */ + private final static String CONFIGDIR = "shotoku.internal.feeds.configdir"; + private final static String CONFIGID = "shotoku.internal.feeds.configcmid"; - private final static String SITE_NAME_PARAM = "${site-name}"; - - private final static String FEEDS_BASEDIR = "shotoku.feeds.basedir"; + /* + * Property name suffixes, under which content manager id and name + * of the directory which contains the feed files can be found. + */ + private final static String FEEDDIR = ".xml.directory"; + private final static String FEEDID = ".xml.cmid"; - protected final static String FEEDS_FILE_PREFIX = "shotoku-feeds"; + /** + * Property name suffix, under which information about available + * variables can be found. + */ + private final static String ALL_VARS = ".variables"; + /** + * Property name middle, under which informatin about a concerete + * variable can be found (should be prepended with an id and followed + * by a property name). + */ + private final static String ONE_VAR = ".variable."; + /** + * Variable, for which feed type will be substituted. + */ + public final static String TYPE_VARIABLE = "${type}"; + @CacheItem private static FeedsCache feedsCache; + @CacheItem + private static FeedsConfigurationWatcher conf; + static synchronized FeedsDescriptor getInstance(String id, String baseServerAddress) { return feedsCache.get(new Pair<String, String>(id, baseServerAddress)); } /** - * <code>feeds</code> - a map of ready feeds: feed name -> (feed type -> - * feed)). + * Ready feeds: feed name -> (feed type -> feed). */ private Map<String, Map<String, Feed>> feeds; /** - * <code>feedGroups</code> - map: feed group display name -> set of feed + * Feed group display name -> set of feed * names. */ private Map<String, Set<String>> feedGroups; - /** - * <code>feedDisplayNames</code> - map: feed name -> feed display name. - */ - private Map<String, String> feedDisplayNames; + /** + * Map variable name -> variable resolver class (read from properties). + */ + private Map<String, Class> varResolvers; - /** - * <code>siteDisplayNames</code> - map: site name -> site display name. - */ - private Map<String, String> siteDisplayNames; + private String baseServerAddress; - private DelegateContext context; - - private String baseServerAddress; - public FeedsDescriptor(String id, String baseServerAddress) { this.baseServerAddress = baseServerAddress; - String feedsBaseDir = ContentManager.getProperty(FEEDS_BASEDIR); + Properties props = conf.get(new Pair<String, String>( + ContentManager.getProperty(CONFIGID, ""), + ContentManager.getProperty(CONFIGDIR, "") + )); - if (feedsBaseDir == null) - throw new RuntimeException(FEEDS_BASEDIR+" property missing from "+ - "shotoku.properties. Shotoku Feeds needs"+ - " this to know where to load the feeds "+ - "descriptor files."); + ContentManager cm = ContentManager.getContentManager( + props.getProperty(id + FEEDID), + props.getProperty(id + FEEDDIR) + ); - ContentManager cm = ContentManager.getContentManager(feedsBaseDir+"/" - + FEEDS_DIRECTORY); + // Creating maps of available variable resolver classes + varResolvers = new HashMap<String, Class>(); + for (String variable : props.getProperty(id + ALL_VARS, "").split("[,]")) { + try { + varResolvers.put(variable, + Class.forName(props.getProperty(id + ONE_VAR + variable))); + } catch (ClassNotFoundException e) { + log.error("Variable resolver class " + props.getProperty(id + + ONE_VAR + variable) + " for variable " + variable + + " not found", e); + } + } - // Creating the maps that will hold the feeds. + // Creating the maps that will hold the feeds. feeds = new HashMap<String, Map<String, Feed>>(); feedGroups = new LinkedHashMap<String, Set<String>>(); - feedDisplayNames = new HashMap<String, String>(); - siteDisplayNames = new HashMap<String, String>(); // Preparing maps which will hold feed definitions. - Map<String, Node> remoteFeedDefs = new HashMap<String, Node>(); - Map<String, Node> aggregatedFeedDefs = new HashMap<String, Node>(); - Map<String, Node> shotokuFeedDefs = new HashMap<String, Node>(); + Map<String, FeedDefinition> remoteFeedDefs = new HashMap<String, FeedDefinition>(); + Map<String, FeedDefinition> aggregatedFeedDefs = new HashMap<String, FeedDefinition>(); + Map<String, FeedDefinition> shotokuFeedDefs = new HashMap<String, FeedDefinition>(); - Map<String, Map<String, Node>> allFeedDefs = - new HashMap<String, Map<String, Node>>(); + Map<String, Map<String, FeedDefinition>> allFeedDefs = + new HashMap<String, Map<String, FeedDefinition>>(); allFeedDefs.put(REM_FEED_TAG, remoteFeedDefs); allFeedDefs.put(AGG_FEED_TAG, aggregatedFeedDefs); allFeedDefs.put(SHO_FEED_TAG, shotokuFeedDefs); // Looking for file containing feed definitons and filling the maps. - for (org.jboss.shotoku.Node feedNode : cm.getRootDirectory().getNodes() - .toList()) { - if (feedNode.getName().endsWith(FEEDS_NODE_ENDING)) { + for (org.jboss.shotoku.Node feedNode : + cm.getRootDirectory().getNodes().toList()) { + if (feedNode.getName().endsWith(NODE_ENDING)) { try { addFeedDefinitions(allFeedDefs, feedNode); } catch (Exception e) { - // We just don't add the feeds ... but log a warning. - log.warn("Can't add feed definitions.", e); + // We just don't add the feeds ... and log a warning. + log.warn("Can't add feed definitions from node " + + feedNode.getFullName() + ".", e); } } } @@ -178,24 +234,65 @@ // Firstly - the remote feeds. generateRemoteFeeds(remoteFeedDefs); - // Then, shotoku feeds - first loading the properties - directive classes. - Properties props = new Properties(); - try { - props.load(cm.getNode(SHOTOKU_CONFIG).getContentInputStream()); - } catch (Exception e) { - log.warn("Error loading shotoku feeds configuration.", e); - } + // Later, shotoku feeds. + generateShotokuFeeds(shotokuFeedDefs, props); - generateShotokuFeeds(shotokuFeedDefs, props); - // After that, we can create the aggregated feeds. generateAggregatedFeeds(aggregatedFeedDefs); - - // Finally, filling the context. - fillContext(); } - /** + /** + * A pattern which matcher variables of the form "${text with numbers}". + */ + private final static Pattern variablesPattern = Pattern.compile( + Pattern.quote("${") + "[a-zA-Z0-9]*" + Pattern.quote("}")); + + /** + * From the given node's attributes, reads all variables (that is, strings + * which match <code>vairablesPattern</code> and adds them to the given + * set. + * @param toFill Set to which found variables should be added. + * @param n Node from which to read the attributes. + */ + private void addVariablesFromNode(Set<String> toFill, Node n) { + NamedNodeMap nnm = n.getAttributes(); + + for (int i=0; i<nnm.getLength(); i++) { + String text = Tools.unmarshallText(nnm.item(i)); + Matcher m = variablesPattern.matcher(text); + + while (m.find()) { + toFill.add(text.substring(m.start(), m.end()+1)); + } + } + } + + private VariableResolver instantiateVariableResolver(String variable, Node n) { + Class varResolverClass = varResolvers.get(variable); + if (varResolverClass == null) { + log.error("Unsupported variable found: " + variable + "."); + return new NullVariableResolver(); + } + + try { + Constructor c = varResolverClass.getConstructor(Node.class); + try { + return (VariableResolver) c.newInstance(n); + } catch (Exception e) { + log.error("Error instatiating variable resolver " + varResolverClass + ".", e); + } + } catch (NoSuchMethodException e) { + try { + return (VariableResolver) varResolverClass.getConstructor().newInstance(); + } catch (Exception e2) { + log.error("Error instatiating variable resolver " + varResolverClass + ".", e2); + } + } + + return new NullVariableResolver(); + } + + /** * Adds a feed of the given name and type. * @param name * @param type @@ -212,38 +309,6 @@ } /** - * Gets an array of ids of Sites - * @return An array of site ids for this shotoku feeds instance. - */ - private String[] getSiteIds() { - if (FeedsHelper.getSiteIds() != null) - return FeedsHelper.getSiteIds(); - else - return new String[] { "" }; - } - - /** - * @param siteId - * @return Name of a site with the given id. - */ - private String getSiteName(String siteId) { - return FeedsHelper.getSiteName(siteId); - } - - /** - * Gets an array of types basing on the given type attribute (the attribute can be a *). - * @param typesAttr - * @return An array of types. - */ - private String[] getTypes(String typesAttr) { - if (ALL_TOKENS.equals(typesAttr)) { - return FeedFactory.getAllFeedTypes(); - } else { - return typesAttr.split("[" + TOKENS_DELIMITER + "]"); - } - } - - /** * In the given <code>map</code>, in its values, replaces each occurence of * <code>replaceWhat</code> with <code>replaceTo</code>. * @param map @@ -428,58 +493,49 @@ continue; } } - - // Finally, adding a feed name. We have to replace ${site} - // and ${site-name} in it. - feedDisplayNames.put(feedNameReplaced, displayNameAttr.replace( - SITE_PARAM, site).replace(SITE_NAME_PARAM, - getSiteName(site))); } } } - private void generateRemoteFeeds(Map<String, Node> feedDefs) { + private void generateRemoteFeeds(Map<String, FeedDefinition> feedDefs) { for (String feedName : feedDefs.keySet()) { - Node feedNode = feedDefs.get(feedName); - String addressAttr = XmlTools - .getAttributeValue(feedNode, "address"); - String typesAttr = XmlTools.getAttributeValue(feedNode, "type"); - String displayNameAttr = XmlTools.getAttributeValue(feedNode, - "display-name"); + FeedDefinition feedDefinition = feedDefs.get(feedName); + Node feedNode = feedDefinition.definition; - // Generating the type of feeds that have been requested. - String[] types = getTypes(typesAttr); + String addressAttr = XmlTools.getAttributeValue(feedNode, "address"); + String displayNameAttr = XmlTools.getAttributeValue(feedNode, "display-name"); - // Generating the sites for which the feeds have been requested, - // if any. - String[] sites = getSiteIds(); + Set<String> variables = new HashSet<String>(); + // We always have to substitute the type variable. + variables.add(TYPE_VARIABLE); + addVariablesFromNode(variables, feedNode); - // For each type, site pair generating a feed and storing it in - // the feeds map. - for (String siteId : siteIds) { - String feedNameReplaced = feedName.replace(SITE_PARAM, - siteId); + Set<Substitution> substitutions = Substitution.newEmptySubstitionsSet(); - for (String type : types) { - String address = addressAttr.replace(TYPE_PARAM, type) - .replace(SITE_PARAM, siteId); + for (String variable : new HashSet<String>(variables)) { + instantiateVariableResolver(variable, feedNode). + expandSubstitutionsSet(variables, substitutions); + } - try { - Feed newFeed = FeedFactory.getNewFeed(type); - newFeed.generate(new URL(address)); - addFeed(feedNameReplaced, type, newFeed); - } catch (Exception e) { - log.debug("Can't add feed " + address + " : " + type - + ".", e); - } - } + if (variables.size() > 0) { + log.warn("Unresolved variables left: " + variables.toString() + " in feed " + + feedName + "."); + continue; + } - // Adding a feed name. We have to replace ${site} - // and ${site-name} in it. - feedDisplayNames.put(feedNameReplaced, displayNameAttr.replace( - SITE_PARAM, siteId).replace(SITE_NAME_PARAM, - getSiteName(siteId))); - } + for (Substitution s : substitutions) { + String feedNameSub = s.make(feedName); + String feedType = s.getSubstitutionFor(TYPE_VARIABLE); + try { + Feed feed = FeedFactory.getNewFeed(feedNameSub, + s.make(displayNameAttr), feedType); + feed.generate(new URL(s.make(addressAttr))); + addFeed(feedNameSub, feedType, feed); + } catch (Exception e) { + log.debug("Can't add feed " + s.make(addressAttr) + " : " + feedType + + ".", e); + } + } } } @@ -646,24 +702,6 @@ } /** - * To the given feed group, adds feeds names that are defined by the given - * node and feed name (this can be more then one, as we can have iteration - * over many sites). - * @param feedGroup - * @param feedName - * @param node - */ - private void addFeedNamesToGroup(Set<String> feedGroup, - String feedName, Node node) { - - String[] siteIds = getSiteIds(); - - for (String siteId : siteIds) { - feedGroup.add(feedName.replace(SITE_PARAM, siteId)); - } - } - - /** * Adds definitions of feeds to the given map, placing child nodes of * the given node in the appropriate map. * @param feedDefinitions A map into which feeds will be added. @@ -671,33 +709,31 @@ * @throws SAXException * @throws IOException */ - private void addFeedDefinitions(Map<String, Map<String, Node>> feedDefinitions, + private void addFeedDefinitions(Map<String, Map<String, FeedDefinition>> feedDefinitions, org.jboss.shotoku.Node node) throws SAXException, IOException { DOMParser parser = new DOMParser(); // Parse the descriptor at the given Shotoku node. parser.parse(new InputSource(node.getContentInputStream())); // Get the XML document element of the feed descriptor file. Node root = parser.getDocument().getDocumentElement(); + String groupName = XmlTools.getAttributeValue(root, "display-name"); - Node n; - NodeList nodes = root.getChildNodes(); - - Set<String> feedGroup = new LinkedHashSet<String>(); + Set<String> feedGroup = new LinkedHashSet<String>(); // Each feed descriptor file has one feed group. // Get the name of the feed group for this file. - feedGroups.put(XmlTools.getAttributeValue(root, "display-name"), - feedGroup); + feedGroups.put(groupName, feedGroup); + NodeList nodes = root.getChildNodes(); + // Iterate through the rest of the feed descriptor // file to load all feeds for a given feed group. for (int i = 0; i < nodes.getLength(); i++) { - n = nodes.item(i); + Node n = nodes.item(i); if (feedDefinitions.get(n.getNodeName()) != null) { // Get the name of the feed. String feedName = XmlTools.getAttributeValue(n, "name"); - // Add the feeds in the file to the group. - addFeedNamesToGroup(feedGroup, feedName, n); - feedDefinitions.get(n.getNodeName()).put(feedName, n); + feedDefinitions.get(n.getNodeName()).put(feedName, + new FeedDefinition(groupName, n)); } } } @@ -716,7 +752,10 @@ return feedTypes.get(type); } - public DelegateContext getContext() { - return context; - } + /** + * Releases all feeds - deletes temporary files which contain them. + */ + public void release() { + + } } Modified: labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/FeedsServlet.java =================================================================== --- labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/FeedsServlet.java 2006-05-16 20:46:01 UTC (rev 4256) +++ labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/FeedsServlet.java 2006-05-16 23:10:59 UTC (rev 4257) @@ -29,45 +29,46 @@ import javax.servlet.http.HttpServletResponse; import org.jboss.forge.common.ForgeHelper; +import org.jboss.shotoku.feeds.data.Feed; public class FeedsServlet extends HttpServlet { - private void invalidRequest(HttpServletResponse response) throws IOException { - response.setContentType("text/html"); - response.getWriter().println("The feed you requested is not available."); - } - - @Override - protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { - String requestURI = request.getRequestURI(); - - // Getting rid of the /war-name/. - requestURI = requestURI.split("[/]", 3)[2]; - - // Getting rid of the possible '/' at the end of the request. - if (requestURI.endsWith("/")) - requestURI = requestURI.substring(0, requestURI.length()-1); - - // Splitting the URI into name and type. - int lastSlash = requestURI.lastIndexOf('/'); - - if (lastSlash == -1) { - invalidRequest(response); - return; - } - - String type = requestURI.substring(lastSlash+1); - String name = requestURI.substring(0, lastSlash); + private void invalidRequest(HttpServletResponse response) throws IOException { + response.setContentType("text/html"); + response.getWriter().println("The feed you requested is not available."); + } - Feed feed = FeedsDescriptor.getInstance(ForgeHelper.LABS_PORTAL, - ForgeHelper.getBaseServerAddress(request)).getFeed(name, type); - - if (feed == null) { - invalidRequest(response); - return; - } - - feed.write(response); - } + @Override + protected void doGet(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { + String requestURI = request.getRequestURI(); + // Getting rid of the /war-name/. + requestURI = requestURI.split("[/]", 3)[2]; + + // Getting rid of the possible '/' at the end of the request. + if (requestURI.endsWith("/")) + requestURI = requestURI.substring(0, requestURI.length()-1); + + // Splitting the URI into name and type. + int lastSlash = requestURI.lastIndexOf('/'); + + if (lastSlash == -1) { + invalidRequest(response); + return; + } + + String type = requestURI.substring(lastSlash+1); + String name = requestURI.substring(0, lastSlash); + + Feed feed = FeedsDescriptor.getInstance(ForgeHelper.LABS_PORTAL, + ForgeHelper.getBaseServerAddress(request)).getFeed(name, type); + + if (feed == null) { + invalidRequest(response); + return; + } + + feed.write(response); + } + } Deleted: labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/FileBasedFeed.java =================================================================== --- labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/FileBasedFeed.java 2006-05-16 20:46:01 UTC (rev 4256) +++ labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/FileBasedFeed.java 2006-05-16 23:10:59 UTC (rev 4257) @@ -1,120 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.shotoku.feeds; - -import java.io.BufferedInputStream; -import java.io.BufferedOutputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.FileWriter; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.Writer; -import java.net.URL; - -import javax.servlet.http.HttpServletResponse; - -public abstract class FileBasedFeed implements Feed { - private final static int BUF_SIZE = 32768; - - private File file; - - public FileBasedFeed(File file) { - this.file = file; - } - - private void transfer(InputStream is, OutputStream os) throws IOException { - byte[] buffer = new byte[BUF_SIZE]; - int read; - while ((read = is.read(buffer)) != -1) - os.write(buffer, 0, read); - } - - public void generate(URL url) throws IOException { - InputStream is = null; - - try { - is = url.openStream(); - generate(is); - } finally { - if (is != null) { - is.close(); - } - } - } - - public void generate(InputStream is) throws IOException { - OutputStream os = null; - - try { - file.createNewFile(); - os = new BufferedOutputStream(new FileOutputStream(file)); - transfer(is, os); - } finally { - if (os != null) { - os.close(); - } - } - } - - public void write(OutputStream os) throws IOException { - InputStream is = null; - try { - is = new BufferedInputStream(new FileInputStream(file)); - transfer(is, os); - } finally { - if (is != null) { - is.close(); - } - } - } - - public Writer getWriter() throws IOException { - return new FileWriter(file); - } - - protected abstract String getContentType(); - - public void write(HttpServletResponse response) throws IOException { - response.setContentType(getContentType()); - write(response.getOutputStream()); - } - - protected File getFile() { - return file; - } - - public void finalize() { - file.delete(); - } - - public InputStream getInputStream() { - try { - return new FileInputStream(file); - } catch (FileNotFoundException e) { - return null; - } - } -} Deleted: labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/InformaBasedFeed.java =================================================================== --- labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/InformaBasedFeed.java 2006-05-16 20:46:01 UTC (rev 4256) +++ labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/InformaBasedFeed.java 2006-05-16 23:10:59 UTC (rev 4257) @@ -1,65 +0,0 @@ -package org.jboss.shotoku.feeds; - -import java.io.File; -import java.io.IOException; -import java.net.URL; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; - -import de.nava.informa.core.ChannelExporterIF; -import de.nava.informa.core.ChannelIF; -import de.nava.informa.core.ItemIF; -import de.nava.informa.core.ParseException; -import de.nava.informa.impl.basic.ChannelBuilder; -import de.nava.informa.parsers.FeedParser; -import de.nava.informa.utils.ItemComparator; - -public abstract class InformaBasedFeed extends FileBasedFeed { - public InformaBasedFeed(File file) { - super(file); - } - - protected abstract ChannelExporterIF getExporter() throws IOException; - - @SuppressWarnings("unchecked") - public void generate(Feed[] feeds, String title, String description, - String author, String link) throws IllegalArgumentException, - IOException { - ChannelBuilder builder = new ChannelBuilder(); - ChannelIF newChannel = builder.createChannel(title); - newChannel.setTitle(title); - newChannel.setDescription(description); - newChannel.setCreator(author); - newChannel.setPublisher(author); - newChannel.setLocation(new URL(link)); - newChannel.setPubDate(Calendar.getInstance().getTime()); - - List<ItemIF> newItems = new ArrayList<ItemIF>(); - - for (Feed feed : feeds) { - ChannelIF childChannel; - try { - childChannel = FeedParser.parse(builder, feed.getInputStream()); - } catch (ParseException e) { - throw new IOException(e.getMessage()); - } - - for (Object o : childChannel.getItems()) { - ItemIF nextItem = (ItemIF) o; - nextItem.setCreator(childChannel.getCreator()); - newItems.add(nextItem); - } - } - - Collections.sort(newItems, new ItemComparator(true)); - - for (ItemIF newItem : newItems) { - newChannel.addItem(newItem); - } - - getExporter().write(newChannel); - } -} Deleted: labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/RdfDateFormat.java =================================================================== --- labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/RdfDateFormat.java 2006-05-16 20:46:01 UTC (rev 4256) +++ labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/RdfDateFormat.java 2006-05-16 23:10:59 UTC (rev 4257) @@ -1,23 +0,0 @@ -package org.jboss.shotoku.feeds; - -import java.text.SimpleDateFormat; -import java.util.Date; - -/** - * This is a class that formats dates according to RFC 3399. Standard java date - * formats are insufficient, becuase they format timezones incorrectly, for - * ex. as "-0100", whereas as stated in RFC 3399, Atom 0.3 specification, and - * as accepted by Rome, it should be "-01:00". - * @author Adam Warski (ad...@as...) - */ -public class RdfDateFormat { - private final static String RFC_3339_DATE = "yyyy-MM-dd'T'HH:mm:ss"; - private final static String ZONE = "Z"; - - public String format(Date date) { - String noZoneDate = new SimpleDateFormat(RFC_3339_DATE).format(date); - String zone = new SimpleDateFormat(ZONE).format(date); - - return noZoneDate + zone.substring(0, 3) + ":" + zone.substring(3, 5); - } -} Deleted: labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/RdfFeed.java =================================================================== --- labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/RdfFeed.java 2006-05-16 20:46:01 UTC (rev 4256) +++ labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/RdfFeed.java 2006-05-16 23:10:59 UTC (rev 4257) @@ -1,43 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.shotoku.feeds; - -import java.io.File; -import java.io.IOException; - -import de.nava.informa.core.ChannelExporterIF; -import de.nava.informa.exporters.RSS_1_0_Exporter; - -public class RdfFeed extends InformaBasedFeed { - public RdfFeed(File file) throws IOException { - super(file); - } - - protected ChannelExporterIF getExporter() throws IOException { - return new RSS_1_0_Exporter(getFile()); - } - - @Override - protected String getContentType() { - return "text/xml"; - } -} Deleted: labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/RomeBasedFeed.java =================================================================== --- labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/RomeBasedFeed.java 2006-05-16 20:46:01 UTC (rev 4256) +++ labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/RomeBasedFeed.java 2006-05-16 23:10:59 UTC (rev 4257) @@ -1,103 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.shotoku.feeds; - -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import j... [truncated message content] |
|
From: <jbo...@li...> - 2006-05-16 20:46:09
|
Author: soh...@jb... Date: 2006-05-16 16:46:01 -0400 (Tue, 16 May 2006) New Revision: 4256 Modified: labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/ui/action/AdminController.java labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/admin/index.xhtml Log: 1) http://jira.jboss.com/jira/browse/JBFORUMS-56 - Create New Forum 2) http://jira.jboss.com/jira/browse/JBFORUMS-63 - Move Up 3) http://jira.jboss.com/jira/browse/JBFORUMS-64 - Move Down Modified: labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/ui/action/AdminController.java =================================================================== --- labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/ui/action/AdminController.java 2006-05-16 20:17:40 UTC (rev 4255) +++ labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/ui/action/AdminController.java 2006-05-16 20:46:01 UTC (rev 4256) @@ -21,14 +21,12 @@ */ package org.jboss.portlet.forums.ui.action; +import java.util.Iterator; + import org.jboss.portlet.forums.ui.*; import org.jboss.portlet.forums.model.Category; import org.jboss.portlet.forums.model.Forum; -import org.jboss.portlet.forums.model.Topic; -import org.jboss.portlet.forums.model.Poll; -import org.jboss.portlet.forums.model.PollOption; -import org.jboss.portlet.forums.model.Poster; /** * @@ -38,6 +36,9 @@ */ public class AdminController extends ActionController { + private static final int up = -15; + private static final int down = 15; + /** * ui data associated with "Category" information * @@ -172,5 +173,137 @@ } } return navState; - } + } + + /** + * + * + */ + public String moveCategoryUp() + { + String navState = null; + try + { + //get the categoryId where this forum should be added + int categoryId = -1; + String cour = ForumUtil.getParameter(Constants.p_categoryId); + if(cour!=null && cour.trim().length()>0) + { + categoryId = Integer.parseInt(cour); + } + + Category category = BaseController.getForumsModule().findCategoryById(new Integer(categoryId)); + category.setOrder(category.getOrder() + AdminController.up); + Iterator categories = BaseController.getForumsModule().findCategories().iterator(); + for (int index = 10; categories.hasNext(); index += 10) + { + category = (Category)categories.next(); + category.setOrder(index); + } + } + catch(Exception e) + { + JSFUtil.handleException(e); + } + return navState; + } + + /** + * + * + */ + public String moveCategoryDown() + { + String navState = null; + try + { + //get the categoryId where this forum should be added + int categoryId = -1; + String cour = ForumUtil.getParameter(Constants.p_categoryId); + if(cour!=null && cour.trim().length()>0) + { + categoryId = Integer.parseInt(cour); + } + + Category category = BaseController.getForumsModule().findCategoryById(new Integer(categoryId)); + category.setOrder(category.getOrder() + AdminController.down); + Iterator categories = BaseController.getForumsModule().findCategories().iterator(); + for (int index = 10; categories.hasNext(); index += 10) + { + category = (Category)categories.next(); + category.setOrder(index); + } + } + catch(Exception e) + { + JSFUtil.handleException(e); + } + return navState; + } + + /** + * + * + */ + public String moveForumUp() + { + String navState = null; + try + { + //get the categoryId where this forum should be added + int forumId = -1; + String cour = ForumUtil.getParameter(Constants.p_forumId); + if(cour!=null && cour.trim().length()>0) + { + forumId = Integer.parseInt(cour); + } + + Forum forum = BaseController.getForumsModule().findForumById(new Integer(forumId)); + forum.setOrder(forum.getOrder() + AdminController.up); + Iterator forums = BaseController.getForumsModule().findForumsByCategoryId(forum.getCategory().getId()).iterator(); + for (int index = 10; forums.hasNext(); index += 10) + { + forum = (Forum)forums.next(); + forum.setOrder(index); + } + } + catch(Exception e) + { + JSFUtil.handleException(e); + } + return navState; + } + + /** + * + * + */ + public String moveForumDown() + { + String navState = null; + try + { + //get the categoryId where this forum should be added + int forumId = -1; + String cour = ForumUtil.getParameter(Constants.p_forumId); + if(cour!=null && cour.trim().length()>0) + { + forumId = Integer.parseInt(cour); + } + + Forum forum = BaseController.getForumsModule().findForumById(new Integer(forumId)); + forum.setOrder(forum.getOrder() + AdminController.down); + Iterator forums = BaseController.getForumsModule().findForumsByCategoryId(forum.getCategory().getId()).iterator(); + for (int index = 10; forums.hasNext(); index += 10) + { + forum = (Forum)forums.next(); + forum.setOrder(index); + } + } + catch(Exception e) + { + JSFUtil.handleException(e); + } + return navState; + } } Modified: labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/admin/index.xhtml =================================================================== --- labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/admin/index.xhtml 2006-05-16 20:17:40 UTC (rev 4255) +++ labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/admin/index.xhtml 2006-05-16 20:46:01 UTC (rev 4256) @@ -68,8 +68,16 @@ </td> <td class="cat" align="center" valign="middle" nowrap="nowrap"> <span class="gen"> - <a href="">${resource.Move_up}</a> - <a href="">${resource.Move_down}</a> + <h:form> + <input type="hidden" name="c" value="#{category.id}"/> + <h:commandLink action="#{adminController.moveCategoryUp}"> + <h:outputText value="${resource.Move_up}"/> + </h:commandLink> + &nbsp;&nbsp;&nbsp; + <h:commandLink action="#{adminController.moveCategoryDown}"> + <h:outputText value="${resource.Move_down}"/> + </h:commandLink> + </h:form> </span> </td> <td class="catRight" align="center" valign="middle"> @@ -103,9 +111,16 @@ </td> <td class="row1" align="center" valign="middle"> <span class="gen"> - <a href="">${resource.Move_up}</a> - <br/> - <a href="">${resource.Move_down}</a> + <h:form> + <input type="hidden" name="f" value="#{forum.id}"/> + <h:commandLink action="#{adminController.moveForumUp}"> + <h:outputText value="${resource.Move_up}"/> + </h:commandLink> + &nbsp;&nbsp;&nbsp; + <h:commandLink action="#{adminController.moveForumDown}"> + <h:outputText value="${resource.Move_down}"/> + </h:commandLink> + </h:form> </span> </td> <td class="row2" align="center" valign="middle"> |
|
From: <jbo...@li...> - 2006-05-16 20:17:46
|
Author: mar...@jb... Date: 2006-05-16 16:17:40 -0400 (Tue, 16 May 2006) New Revision: 4255 Added: labs/jbossrules/trunk/drools-jsr94/src/main/resources/ Log: -added resources directory for modular ant build |
|
From: <jbo...@li...> - 2006-05-16 19:41:14
|
Author: szimano
Date: 2006-05-16 15:41:10 -0400 (Tue, 16 May 2006)
New Revision: 4254
Modified:
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiCommon.java
Log:
JBWIKI-87
again queue name
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiCommon.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiCommon.java 2006-05-16 19:39:21 UTC (rev 4253)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiCommon.java 2006-05-16 19:41:10 UTC (rev 4254)
@@ -80,7 +80,7 @@
QueueSession sess = null;
Queue queue = null;
try {
- queue = (Queue) context.lookup("queue/mdb");
+ queue = (Queue) context.lookup("queue/wikiNotifications");
QueueConnectionFactory factory = (QueueConnectionFactory) context
.lookup("ConnectionFactory");
sess = factory.createQueueConnection().createQueueSession(
|
550 messages has been excluded from this view by a project administrator.
