jboss-svn-commits — JBoss SVN commit notifications

[Jboss-svn-commits] JBL Code SVN: r4204 - labs/jbossrules/trunk/documentation/manual/en

[<jbo...@li...>]

Author: mic...@jb...
Date: 2006-05-12 05:29:47 -0400 (Fri, 12 May 2006)
New Revision: 4204

Modified:
   labs/jbossrules/trunk/documentation/manual/en/master.xml
Log:
new deployment section

Modified: labs/jbossrules/trunk/documentation/manual/en/master.xml
===================================================================
--- labs/jbossrules/trunk/documentation/manual/en/master.xml	2006-05-12 09:29:30 UTC (rev 4203)
+++ labs/jbossrules/trunk/documentation/manual/en/master.xml	2006-05-12 09:29:47 UTC (rev 4204)
@@ -145,6 +145,11 @@
 
       <xi:include href="Chapter-Examples/Section-Examples.xml" />
     </chapter>
+
+	<chapter>
+		<title>Deployment</title>
+		<xi:include href="Chapter-Deployment/Section-Deployment.xml" />
+	</chapter>
     
     <chapter>
       <title>Papers</title>

[Jboss-svn-commits] JBL Code SVN: r4203 - labs/jbossrules/trunk/documentation/manual/en/Chapter-Performance_Tuning

[<jbo...@li...>]

Author: mic...@jb...
Date: 2006-05-12 05:29:30 -0400 (Fri, 12 May 2006)
New Revision: 4203

Modified:
   labs/jbossrules/trunk/documentation/manual/en/Chapter-Performance_Tuning/Section-Performance.xml
Log:
new deployment section

Modified: labs/jbossrules/trunk/documentation/manual/en/Chapter-Performance_Tuning/Section-Performance.xml
===================================================================
--- labs/jbossrules/trunk/documentation/manual/en/Chapter-Performance_Tuning/Section-Performance.xml	2006-05-12 09:03:09 UTC (rev 4202)
+++ labs/jbossrules/trunk/documentation/manual/en/Chapter-Performance_Tuning/Section-Performance.xml	2006-05-12 09:29:30 UTC (rev 4203)
@@ -2,7 +2,7 @@
 <!DOCTYPE section PUBLIC "-//OASIS//DTD Simplified DocBook XML V1.0//EN"
 "http://www.oasis-open.org/docbook/xml/simple/1.0/sdocbook.dtd">
 <section>
-  <title>Perforamnce considerations</title>
+  <title>Performance considerations</title>
 
   <para>In any reasonably complex application, there are many things that may
   effect performance. The usual advice applies of course (ie don't speculate,

[Jboss-svn-commits] JBL Code SVN: r4202 - in labs/jbossrules/trunk/documentation/manual/en: . Chapter-Deployment

[<jbo...@li...>]

Author: mic...@jb...
Date: 2006-05-12 05:03:09 -0400 (Fri, 12 May 2006)
New Revision: 4202

Added:
   labs/jbossrules/trunk/documentation/manual/en/Chapter-Deployment/
   labs/jbossrules/trunk/documentation/manual/en/Chapter-Deployment/DeploymentPatterns.vsd
   labs/jbossrules/trunk/documentation/manual/en/Chapter-Deployment/DeploymentPatterns1.png
   labs/jbossrules/trunk/documentation/manual/en/Chapter-Deployment/DeploymentPatterns2.png
   labs/jbossrules/trunk/documentation/manual/en/Chapter-Deployment/Section-Deployment.xml
Log:
new deployment section

Added: labs/jbossrules/trunk/documentation/manual/en/Chapter-Deployment/DeploymentPatterns.vsd
===================================================================
(Binary files differ)


Property changes on: labs/jbossrules/trunk/documentation/manual/en/Chapter-Deployment/DeploymentPatterns.vsd
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: labs/jbossrules/trunk/documentation/manual/en/Chapter-Deployment/DeploymentPatterns1.png
===================================================================
(Binary files differ)


Property changes on: labs/jbossrules/trunk/documentation/manual/en/Chapter-Deployment/DeploymentPatterns1.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: labs/jbossrules/trunk/documentation/manual/en/Chapter-Deployment/DeploymentPatterns2.png
===================================================================
(Binary files differ)


Property changes on: labs/jbossrules/trunk/documentation/manual/en/Chapter-Deployment/DeploymentPatterns2.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: labs/jbossrules/trunk/documentation/manual/en/Chapter-Deployment/Section-Deployment.xml
===================================================================
--- labs/jbossrules/trunk/documentation/manual/en/Chapter-Deployment/Section-Deployment.xml	2006-05-12 07:24:44 UTC (rev 4201)
+++ labs/jbossrules/trunk/documentation/manual/en/Chapter-Deployment/Section-Deployment.xml	2006-05-12 09:03:09 UTC (rev 4202)
@@ -0,0 +1,186 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD Simplified DocBook XML V1.0//EN"
+"http://www.oasis-open.org/docbook/xml/simple/1.0/sdocbook.dtd">
+<section>
+  <title>Deployment options</title>
+
+  <para>Once you have rules integrated in your application (or ideally before)
+  you will need to plan how to deploy rules along with your application.
+  Typically rules are used to allow changes to application business logic
+  without re-deploying the whole application. This means that the rules must
+  be provided to the application as data, not as part of the application (eg
+  embedded in the classpath).</para>
+
+  <para>Drools 3.0 is primarily a Rule Engine, which leaves open many options
+  for rule deployment. The focus of this chapter is on deployment options, and
+  the API. A future version of Drools will have a Rule Server component for
+  managing multiple versions of rules (including locking, and automatic
+  deployment).</para>
+
+  <para>As every organisation is subtly different, and different deployment
+  patterns will be needed. Many organisations have (or should have)
+  configuration management processes for changes to production systems. It is
+  best to think of rules as "data" rather then software in that regard.
+  However, as rules can contain a considerable amount of powerful logic,
+  proper procedures should be used in testing and verifying rule changes, and
+  approving changes before exposing them to the world.</para>
+
+  <section>
+    <title>Deployable objects, RuleBase, Package etc.</title>
+
+    <para>In the simplest possible scenario, you would compile and construct a
+    rulebase, and then cache that rulebase. That rulebase can be shared across
+    threads, spawning new working memories to process transactions (working
+    memories are then discarded). This is essentually the stateless mode. To
+    update the rulebase, a new rulebase is loaded, and then swapped out with
+    the cached rulebase (any existing threads that happen to be using the old
+    rulebase will continue to use it until they are finished, in which case it
+    will eventually be garbage collected).</para>
+
+    <para>There are many more sophisticated approaches to the above - Drools
+    rule engine is very dynamic, meaning pretty much all the components can be
+    swapped out on the fly (rules, packages) even when there are *existing*
+    working memories in use. For instance rules can be retracted from a
+    rulebase which has many in-use working memories - the RETE network will
+    then be adjusted to remove that rule without having to assert all the
+    facts again. Long running working memories are useful for complex
+    applications where the rule engine builds up knowledge over time to assist
+    with decision making for instance - it is in these cases that the dynamic-ness of the engine can really shine.</para>
+
+    <section>
+      <title>DRL and PackageDescr</title>
+
+      <para>One option is to deploy the rules in source form. This leaves the
+      runtime engine (which must include the compiler components) to compile
+      the rules, and build the rule base. A similar approach is to deploy the
+      "PackageDescr" object, which means that the rules are pre-parsed (for
+      syntactic errors) but not compiled into the binary form. Use the
+      PackageBuilder class to achieve this. You can of course use the XML form
+      for the rules if needed. <programlisting>PackageDescr, PackageBuilder, RuleBaseLoader</programlisting></para>
+    </section>
+
+    <section>
+      <title>Package</title>
+
+      <para>This option is the most flexible. In this case, Packages are built
+      from DRL source using PackageBuilder - but it is the binary Package
+      objects that are actually deployed. Packages can be merged together.
+      That means a package containing perhaps a single new rule, or a change
+      to an existing rule, can be built on its own, and then merged in with an
+      existing package in an existing RuleBase. The rulebase can then notify
+      existing working memories that a new rule exists (as the RuleBase keeps
+      "weak" links back to the Working Memory instances that it spawned). The
+      rulebase keeps a list of Packages, and to merge into a package, you will
+      need to know which package you need to merge into (as obviously, only
+      rules from the same package name can be merged together).</para>
+
+      <para>Package objects themselves are serializable, hence they can be
+      sent over a network, or bound to JNDI, Session etc. <programlisting>PackageBuilder, RuleBase, org.drools.rule.Package</programlisting></para>
+    </section>
+
+    <section>
+      <title>RuleBase</title>
+
+      <para>Compiled Packages are added to rulebases. RuleBases are
+      serializable, so they can be a binary deployment unit themselves. This
+      can be a useful option for when rulebases are updated as a whole - for
+      short lived working memories. If existing working memories need to have
+      rules changed on the fly, then it is best to deploy Package objects.
+      <programlisting>RuleBase, RuleBaseLoader</programlisting></para>
+    </section>
+
+    <section>
+      <title>Serializing</title>
+
+      <para>Practically all of the rulebase related objects in Drools are
+      serializable. For a working memory to be serializable, all of your
+      objects must of course be serializable. So it is always possible to
+      deploy remotely, and "bind" rule assets to JNDI as a means of using them
+      in a container environment.</para>
+    </section>
+  </section>
+
+  <section>
+    <title>Deployment patterns</title>
+
+    <section>
+      <title>In process rule building</title>
+
+      <para>In this case, rules are provided to the runtime system in source
+      form. The runtime system contains the drools-compiler component to build
+      the rules. This is the simplest approach.</para>
+    </section>
+
+    <section>
+      <title>Out of process rule building</title>
+
+      <para>In this case, rules are build into their binary process outside of
+      the runtime system (for example in a deployment server). The chief
+      advantage of deploying from an outside process is that the runtime
+      system can have minimal dependencies (just one jar). It also means that
+      any errors to do with compiling are well contained and and known before
+      deployment to the running system is attempted.</para>
+    </section>
+
+    <section>
+      <title>Some deployment scenarios</title>
+		<para>This section contains some suggested deployment scenarios, of course you can use a variety of techologies as alternatives to the ones in the diagram.</para>
+      <section>
+        <title>Pull style</title>
+
+        <para>In this scenario, rules are pulled from the rule repository into
+        the runtime system. The repository can be as simple as a file system,
+        or a database. The trigger to pull the rules could be a timed task (to
+        check for changes) or a request to the runtime system (perhaps via a
+        JMX interface). This is possibly the more common scenario.</para>
+
+        <screenshot>
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="DeploymentPatterns1.png" />
+            </imageobject>
+          </mediaobject>
+        </screenshot>
+      </section>
+
+      <section>
+        <title>Push style</title>
+
+        <para>In this scenario, the rule deployment process/repository
+        "pushes" rules into the runtime system (either in source or binary
+        form, as described above). This gives more control as to when the new
+        rules take effect.</para>
+
+        <screenshot>
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="DeploymentPatterns2.png" />
+            </imageobject>
+          </mediaobject>
+        </screenshot>
+      </section>
+    </section>
+  </section>
+
+  <section>
+    <title>Web Services</title>
+
+    <para>A possible deployment pattern for rules are to expose the rules as a
+    web service. There a many ways to achieve this, but possibly the simplest
+    way at present do achieve it is to use an interface-first process: Define
+    the "facts" classes/templates that the rules will use in terms of XML
+    Schema - and then use binding technologies to generate binding objects for
+    the rules to actually operate against. A reverse possibility is to use a
+    XSD/WSDL generator to generate XML bindings for classes that are hand
+    built (which the rules work against). It is expected in a future version
+    there will be an automated tool to expose rules as web services (and
+    possibly use XSDs as facts for the rules to operate on).</para>
+  </section>
+
+  <section>
+    <title>Future considerations</title>
+
+    <para>A future release of Drools will contain a rule repository (server)
+    component that will directly support the above patterns, and more.</para>
+  </section>
+</section>
\ No newline at end of file


Property changes on: labs/jbossrules/trunk/documentation/manual/en/Chapter-Deployment/Section-Deployment.xml
___________________________________________________________________
Name: svn:eol-style
   + native

[Jboss-svn-commits] JBL Code SVN: r4201 - labs/kosmos/trunk/web-server/WEB-INF/lib

[<jbo...@li...>]

Author: aron.gombas
Date: 2006-05-12 03:24:44 -0400 (Fri, 12 May 2006)
New Revision: 4201

Added:
   labs/kosmos/trunk/web-server/WEB-INF/lib/ehcache-1.2.jar
Removed:
   labs/kosmos/trunk/web-server/WEB-INF/lib/ehcache-1.2beta5.jar
Modified:
   labs/kosmos/trunk/web-server/WEB-INF/lib/javasvn.jar
Log:
JavaSVN and EHCache upgraded to latest stable

Added: labs/kosmos/trunk/web-server/WEB-INF/lib/ehcache-1.2.jar
===================================================================
(Binary files differ)


Property changes on: labs/kosmos/trunk/web-server/WEB-INF/lib/ehcache-1.2.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: labs/kosmos/trunk/web-server/WEB-INF/lib/ehcache-1.2beta5.jar
===================================================================
(Binary files differ)

Modified: labs/kosmos/trunk/web-server/WEB-INF/lib/javasvn.jar
===================================================================
(Binary files differ)

[Jboss-svn-commits] JBL Code SVN: r4200 - in labs/jbossrules/trunk: drools-compiler/src/test/java/org/drools drools-compiler/src/test/java/org/drools/integrationtests drools-compiler/src/test/resources/org/drools/integrationtests drools-core/src/main/java/org/drools/reteoo drools-core/src/test/java/org/drools/reteoo

[<jbo...@li...>]

Author: tirelli
Date: 2006-05-11 22:55:09 -0400 (Thu, 11 May 2006)
New Revision: 4200

Modified:
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Cheese.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/IntegrationCases.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/LeapsTest.java
   labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsDynamicRule.drl
   labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsDynamicRule2.drl
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/EvalConditionNode.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/JoinNode.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/LeftInputAdapterNode.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/NotNode.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/TerminalNode.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/TupleSource.java
   labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/MockTupleSink.java
   labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/MockTupleSource.java
Log:
Fixing JBRULES-233 new scenario

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Cheese.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Cheese.java	2006-05-11 11:17:32 UTC (rev 4199)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Cheese.java	2006-05-12 02:55:09 UTC (rev 4200)
@@ -41,5 +41,9 @@
     public void setPrice(int price) {
         this.price = price;
     }
+    
+    public String toString() {
+        return "Cheese( type='"+this.type+"', price="+this.price+" )";
+    }
 
 }
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/IntegrationCases.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/IntegrationCases.java	2006-05-11 11:17:32 UTC (rev 4199)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/IntegrationCases.java	2006-05-12 02:55:09 UTC (rev 4200)
@@ -1890,7 +1890,7 @@
                       l.size() );
     }
 
-    public void xxxtestLogicalAssertionsDynamicRule() throws Exception {
+    public void testLogicalAssertionsDynamicRule() throws Exception {
         PackageBuilder builder = new PackageBuilder();
         builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "test_LogicalAssertionsDynamicRule.drl" ) ) );
         Package pkg = builder.getPackage();
@@ -1980,7 +1980,7 @@
         assertFalse( "remove of rule should retract objects logically asserted based on the rule",
                      list.contains( c3.getType() ) );
 
-        c2.setPrice( 1 );
+        c2.setPrice( 3 );
         workingMemory.modifyObject( h,
                                     c2 );
         list = workingMemory.getObjects( c1.getType().getClass() );

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/LeapsTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/LeapsTest.java	2006-05-11 11:17:32 UTC (rev 4199)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/LeapsTest.java	2006-05-12 02:55:09 UTC (rev 4200)
@@ -162,5 +162,9 @@
         assertTrue( "rule2",
                     list.contains( "rule2" ) );
     }
+    
+    public void testLogicalAssertionsDynamicRule() throws Exception {
+        // TODO FIXME
+    }
 
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsDynamicRule.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsDynamicRule.drl	2006-05-11 11:17:32 UTC (rev 4199)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsDynamicRule.drl	2006-05-12 02:55:09 UTC (rev 4200)
@@ -4,7 +4,8 @@
 
 rule "rule1"
     when
-        Cheese( type : type, price : price -> (price.intValue() > 1))
+        #Cheese( type : type, price : price -> (price.intValue() > 1))
+        Cheese( type : type, price > 1 )
     then
 		assertLogical( type );
 end

Modified: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsDynamicRule2.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsDynamicRule2.drl	2006-05-11 11:17:32 UTC (rev 4199)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsDynamicRule2.drl	2006-05-12 02:55:09 UTC (rev 4200)
@@ -4,7 +4,8 @@
 
 rule "rule2"
     when
-        Cheese( type : type, price : price -> (price.intValue() < 3))
+        #Cheese( type : type, price : price -> (price.intValue() < 3))
+        Cheese( type : type, price < 3)
     then
 		assertLogical( type );
 end
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/EvalConditionNode.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/EvalConditionNode.java	2006-05-11 11:17:32 UTC (rev 4199)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/EvalConditionNode.java	2006-05-12 02:55:09 UTC (rev 4200)
@@ -16,12 +16,15 @@
  * limitations under the License.
  */
 
+import java.util.ArrayList;
 import java.util.Iterator;
+import java.util.List;
 
 import org.drools.common.PropagationContextImpl;
 import org.drools.rule.EvalCondition;
 import org.drools.spi.PropagationContext;
 import org.drools.util.LinkedList;
+import org.drools.util.LinkedListObjectWrapper;
 
 /**
  * Node which filters <code>ReteTuple</code>s.
@@ -193,9 +196,13 @@
         LinkedList memory = (LinkedList) workingMemory.getNodeMemory( this );
 
         for ( Iterator it = memory.iterator(); it.hasNext(); ) {
-            propagateAssertTuple( (ReteTuple) it.next(),
-                                  context,
-                                  workingMemory );
+            ReteTuple tuple = (ReteTuple) it.next();
+            ReteTuple child = new ReteTuple( tuple );
+            // no TupleMatch so instead add as a linked tuple
+            tuple.addLinkedTuple( new LinkedListObjectWrapper( child ) );
+            ((TupleSink) getTupleSinks().get( getTupleSinks().size() - 1 )).assertTuple( child,
+                                                                context,
+                                                                workingMemory );
         }
 
         this.attachingNewNode = false;
@@ -244,4 +251,26 @@
     public Object createMemory() {
         return new LinkedList();
     }
+    
+    /**
+     * @inheritDoc
+     */
+    public List getPropagatedTuples(WorkingMemoryImpl workingMemory, TupleSink sink) {
+        LinkedList memory = (LinkedList) workingMemory.getNodeMemory( this );
+        int index = this.getTupleSinks().indexOf( sink );
+        List propagatedTuples = new ArrayList();
+
+        for ( Iterator it = memory.iterator(); it.hasNext(); ) {
+            ReteTuple leftTuple = (ReteTuple) it.next();
+            LinkedList linkedTuples = leftTuple.getLinkedTuples();
+            
+            LinkedListObjectWrapper wrapper = (LinkedListObjectWrapper) linkedTuples.getFirst();
+            for( int c = 0; c < index; c++) {
+                wrapper = (LinkedListObjectWrapper) wrapper.getNext();
+            }
+            propagatedTuples.add( wrapper.getObject() );
+        }
+        return propagatedTuples;
+    }   
+    
 }

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/JoinNode.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/JoinNode.java	2006-05-11 11:17:32 UTC (rev 4199)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/JoinNode.java	2006-05-12 02:55:09 UTC (rev 4200)
@@ -16,7 +16,9 @@
  * limitations under the License.
  */
 
+import java.util.ArrayList;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 
 import org.drools.common.BetaNodeBinder;
@@ -371,7 +373,24 @@
             }
         }
 
-        this.attachingNewNode = true;
+        this.attachingNewNode = false;
     }
+    
+    /**
+     * @inheritDoc
+     */
+    public List getPropagatedTuples(WorkingMemoryImpl workingMemory, TupleSink sink) {
+        BetaMemory memory = (BetaMemory) workingMemory.getNodeMemory( this );
+        int index = this.getTupleSinks().indexOf( sink );
+        List propagatedTuples = new ArrayList();
 
+        for ( Iterator it = memory.getRightObjectMemory().iterator(); it.hasNext(); ) {
+            ObjectMatches objectMatches = (ObjectMatches) it.next();
+            for ( TupleMatch tupleMatch = objectMatches.getFirstTupleMatch(); tupleMatch != null; tupleMatch = (TupleMatch) tupleMatch.getNext() ) {
+                propagatedTuples.add( tupleMatch.getJoinedTuples().get( index ) );
+            }
+        }
+        return propagatedTuples;
+    }   
+
 }

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/LeftInputAdapterNode.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/LeftInputAdapterNode.java	2006-05-11 11:17:32 UTC (rev 4199)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/LeftInputAdapterNode.java	2006-05-12 02:55:09 UTC (rev 4200)
@@ -16,8 +16,10 @@
  * limitations under the License.
  */
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 
 import org.drools.common.BetaNodeBinder;
@@ -301,5 +303,25 @@
         } else {        
             return this.objectSource.equals( other.objectSource ) && this.binder.equals( other.binder );
         }
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public List getPropagatedTuples(WorkingMemoryImpl workingMemory, TupleSink sink) {
+        Map memory = (Map) workingMemory.getNodeMemory( this );
+        int index = this.getTupleSinks().indexOf( sink );
+        List propagatedTuples = new ArrayList();
+
+        for( Iterator i = memory.values().iterator(); i.hasNext(); ) {
+            LinkedList tuples = (LinkedList) i.next();
+            LinkedListObjectWrapper wrapper = (LinkedListObjectWrapper) tuples.getFirst();
+            for( int c = 0; c < index; c++) {
+                wrapper = (LinkedListObjectWrapper) wrapper.getNext();
+            }
+            propagatedTuples.add( wrapper.getObject() );
+        }
+        
+        return propagatedTuples;
     }   
 }

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/NotNode.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/NotNode.java	2006-05-11 11:17:32 UTC (rev 4199)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/NotNode.java	2006-05-12 02:55:09 UTC (rev 4200)
@@ -16,11 +16,15 @@
  * limitations under the License.
  */
 
+import java.util.ArrayList;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 
 import org.drools.common.BetaNodeBinder;
 import org.drools.spi.PropagationContext;
+import org.drools.util.LinkedList;
+import org.drools.util.LinkedListObjectWrapper;
 
 /**
  * <code>NotNode</code> extends <code>BetaNode</code> to perform tests for
@@ -351,18 +355,41 @@
         this.attachingNewNode = true;
 
         BetaMemory memory = (BetaMemory) workingMemory.getNodeMemory( this );
-        //@todo: can we iterate left memory like this?
-        for ( Iterator it = memory.leftTupleIterator( workingMemory,
-                                                      null ); it.hasNext(); ) {
+        for ( Iterator it = memory.getLeftTupleMemory().iterator(); it.hasNext(); ) {
             ReteTuple leftTuple = (ReteTuple) it.next();
             if ( leftTuple.matchesSize() == 0 ) {
-                propagateAssertTuple( leftTuple,
-                                      context,
-                                      workingMemory );
+                ReteTuple child = new ReteTuple( leftTuple );
+                // no TupleMatch so instead add as a linked tuple
+                leftTuple.addLinkedTuple( new LinkedListObjectWrapper( child ) );
+                ((TupleSink) getTupleSinks().get( getTupleSinks().size() - 1 )).assertTuple( child,
+                                                                    context,
+                                                                    workingMemory );
             }
         }
 
         this.attachingNewNode = true;
     }
+    
+    /**
+     * @inheritDoc
+     */
+    public List getPropagatedTuples(WorkingMemoryImpl workingMemory, TupleSink sink) {
+        BetaMemory memory = (BetaMemory) workingMemory.getNodeMemory( this );
+        int index = this.getTupleSinks().indexOf( sink );
+        List propagatedTuples = new ArrayList();
 
+        for ( Iterator it = memory.getLeftTupleMemory().iterator(); it.hasNext(); ) {
+            ReteTuple leftTuple = (ReteTuple) it.next();
+            LinkedList linkedTuples = leftTuple.getLinkedTuples();
+            
+            LinkedListObjectWrapper wrapper = (LinkedListObjectWrapper) linkedTuples.getFirst();
+            for( int c = 0; c < index; c++) {
+                wrapper = (LinkedListObjectWrapper) wrapper.getNext();
+            }
+            propagatedTuples.add( wrapper.getObject() );
+        }
+        return propagatedTuples;
+    }   
+    
+
 }

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/TerminalNode.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/TerminalNode.java	2006-05-11 11:17:32 UTC (rev 4199)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/TerminalNode.java	2006-05-12 02:55:09 UTC (rev 4200)
@@ -265,33 +265,25 @@
         for ( int i = 0, length = workingMemories.length; i < length; i++ ) {
             final WorkingMemoryImpl workingMemory = workingMemories[i];
 
-            final TerminalNodeMemory memory = (TerminalNodeMemory) workingMemory.getNodeMemory( this );
-
-            final AgendaGroupImpl group = memory.getAgendaGroup();
-            final Queueable[] elements = group.getQueueable();
-            final List list = new ArrayList();
-            //start at 1 as BinaryHeapQueue starts at 1
-            for ( int j = 1, size = group.size() + 1; j < size; j++ ) {
-                final AgendaItem item = (AgendaItem) elements[j];
-                if ( item.getRule() == this.rule ) {
-                    list.add( item );
+            for ( final Iterator it = this.tupleSource.getPropagatedTuples( workingMemory, this ).iterator();
+                        it.hasNext(); ) {
+                ReteTuple tuple = (ReteTuple) it.next();
+                Activation activation = tuple.getActivation();
+                
+                if ( activation.isActivated() ) {
+                    activation.remove();
+                    workingMemory.getAgendaEventSupport().fireActivationCancelled( activation );
                 }
-            }
-            for ( final Iterator it = list.iterator(); it.hasNext(); ) {
-                final AgendaItem item = (AgendaItem) it.next();
-                if ( item.isActivated() ) {
-                    item.remove();
-                    workingMemory.getAgendaEventSupport().fireActivationCancelled( item );
-                }
 
                 final PropagationContext propagationContext = new PropagationContextImpl( workingMemory.getNextPropagationIdCounter(),
                                                                                     PropagationContext.RULE_REMOVAL,
                                                                                     null,
                                                                                     null );
-                workingMemory.removeLogicalDependencies( item,
+                workingMemory.removeLogicalDependencies( activation,
                                                          propagationContext,
                                                          this.rule );
             }
+            workingMemory.propagateQueuedActions();
         }
 
         this.tupleSource.remove( this,

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/TupleSource.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/TupleSource.java	2006-05-11 11:17:32 UTC (rev 4199)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/TupleSource.java	2006-05-12 02:55:09 UTC (rev 4200)
@@ -222,4 +222,10 @@
         return this.tupleSinks;
     }
 
+    /**
+     * Returns the list of propagated tuples
+     * @return
+     */
+    public abstract List getPropagatedTuples(WorkingMemoryImpl workingMemory, TupleSink sink);
+
 }

Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/MockTupleSink.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/MockTupleSink.java	2006-05-11 11:17:32 UTC (rev 4199)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/MockTupleSink.java	2006-05-12 02:55:09 UTC (rev 4200)
@@ -18,6 +18,7 @@
 
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 
@@ -110,4 +111,10 @@
 
     }
 
+    public List getPropagatedTuples(WorkingMemoryImpl workingMemory,
+                                    TupleSink sink) {
+        // TODO Auto-generated method stub
+        return Collections.EMPTY_LIST;
+    }
+
 }
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/MockTupleSource.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/MockTupleSource.java	2006-05-11 11:17:32 UTC (rev 4199)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/MockTupleSource.java	2006-05-12 02:55:09 UTC (rev 4200)
@@ -17,6 +17,9 @@
 
 
 
+import java.util.Collections;
+import java.util.List;
+
 import org.drools.spi.PropagationContext;
 
 public class MockTupleSource extends TupleSource {
@@ -58,4 +61,10 @@
 
     }
 
+    public List getPropagatedTuples(WorkingMemoryImpl workingMemory,
+                                    TupleSink sink) {
+        // TODO Auto-generated method stub
+        return Collections.EMPTY_LIST;
+    }
+
 }
\ No newline at end of file

[Jboss-svn-commits] JBL Code SVN: r4199 - labs/jbosstm/trunk/ArjunaJTS

[<jbo...@li...>]

Author: kev...@jb...
Date: 2006-05-11 07:17:32 -0400 (Thu, 11 May 2006)
New Revision: 4199

Modified:
   labs/jbosstm/trunk/ArjunaJTS/INSTALL
Log:
Updated to specify interposition

Modified: labs/jbosstm/trunk/ArjunaJTS/INSTALL
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/INSTALL	2006-05-11 11:11:40 UTC (rev 4198)
+++ labs/jbosstm/trunk/ArjunaJTS/INSTALL	2006-05-11 11:17:32 UTC (rev 4199)
@@ -55,7 +55,7 @@
          <initializer>org.jboss.tm.iiop.TxServerInterceptorInitializer</initializer>
   - add the following lines
          <!-- JBoss TS interceptor -->
-         <initializer>com.arjuna.ats.jts.orbspecific.jacorb.interceptors.context.ContextORBInitializerImpl</initializer>
+         <initializer>com.arjuna.ats.jts.orbspecific.jacorb.interceptors.interposition.InterpositionORBInitializerImpl</initializer>
 
 The application server will now be configured to use the JBossJTS transaction
 manager instead of the JBoss Transaction Manager.

[Jboss-svn-commits] JBL Code SVN: r4198 - labs/jbosstm/trunk/ArjunaJTS

[<jbo...@li...>]

Author: kev...@jb...
Date: 2006-05-11 07:11:40 -0400 (Thu, 11 May 2006)
New Revision: 4198

Modified:
   labs/jbosstm/trunk/ArjunaJTS/build.xml
Log:
Added installation of README.txt to trailmap

Modified: labs/jbosstm/trunk/ArjunaJTS/build.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/build.xml	2006-05-11 11:11:17 UTC (rev 4197)
+++ labs/jbosstm/trunk/ArjunaJTS/build.xml	2006-05-11 11:11:40 UTC (rev 4198)
@@ -321,6 +321,7 @@
 		<copy todir="${com.hp.mwlabs.installationdirectory}/trail_map">
 			<fileset dir="trailmap">
 				<include name="build.xml"/>
+				<include name="README.txt"/>
 				<include name="html/**"/>
 				<include name="src/**"/>
 			</fileset>

[Jboss-svn-commits] JBL Code SVN: r4197 - labs/jbosstm/trunk/ArjunaJTS

[<jbo...@li...>]

Author: kev...@jb...
Date: 2006-05-11 07:11:17 -0400 (Thu, 11 May 2006)
New Revision: 4197

Modified:
   labs/jbosstm/trunk/ArjunaJTS/INSTALL
Log:
Removed configuration of interposition interceptor from installation notes

Modified: labs/jbosstm/trunk/ArjunaJTS/INSTALL
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/INSTALL	2006-05-11 11:07:22 UTC (rev 4196)
+++ labs/jbosstm/trunk/ArjunaJTS/INSTALL	2006-05-11 11:11:17 UTC (rev 4197)
@@ -45,10 +45,7 @@
 
  - Edit the server/all/conf/jacorb.properies as follows.
   - change the jacorb.poa.thread_pool_max property to 32
-  - add the following property the the end of the file
 
-org.omg.PortableInterceptor.ORBInitializerClass.com.arjuna.ats.jts.orbspecific.jacorb.interceptors.interposition.InterpositionORBInitializerImpl=com.arjuna.ats.jts.orbspecific.jacorb.interceptors.interposition.InterpositionORBInitializerImpl
-
  - Edit the server/all/deploy/iiop-service.xml and modify the
    PortableInterceptorInitializers attribute as follows.
   - remove the following lines

[Jboss-svn-commits] JBL Code SVN: r4196 - labs/jbossweb/trunk/src/share/native/build

[<jbo...@li...>]

Author: mla...@jb...
Date: 2006-05-11 07:07:22 -0400 (Thu, 11 May 2006)
New Revision: 4196

Modified:
   labs/jbossweb/trunk/src/share/native/build/buildworld.bat
Log:
Use correct braces

Modified: labs/jbossweb/trunk/src/share/native/build/buildworld.bat
===================================================================
--- labs/jbossweb/trunk/src/share/native/build/buildworld.bat	2006-05-11 11:05:06 UTC (rev 4195)
+++ labs/jbossweb/trunk/src/share/native/build/buildworld.bat	2006-05-11 11:07:22 UTC (rev 4196)
@@ -46,7 +46,7 @@
     call %PSDK5%\SetEnv /XP32 /RETAIL
 ) else (
     call %MSVS8VC%\vcvars32
-}
+)
 goto cmdBuild
 
 :cpuAMD64
@@ -56,7 +56,7 @@
     call %PSDK5%\SetEnv /X64 /RETAIL
 ) else (
     call %MSVS8VC%\amd64\vcvarsamd64
-}
+)
 goto cmdBuild
 
 :cpuIA64
@@ -66,7 +66,7 @@
     call %PSDK5%\SetEnv /SRV64 /RETAIL
 ) else (
     call %MSVS8VC%\amd64\vcvarsamd64
-}
+)
 goto cmdBuild
 
 :cmdBuild

[Jboss-svn-commits] JBL Code SVN: r4195 - labs/jbossweb/trunk/src/share/native/build

[<jbo...@li...>]

Author: mla...@jb...
Date: 2006-05-11 07:05:06 -0400 (Thu, 11 May 2006)
New Revision: 4195

Modified:
   labs/jbossweb/trunk/src/share/native/build/buildworld.bat
Log:
Fix SDK targets.

Modified: labs/jbossweb/trunk/src/share/native/build/buildworld.bat
===================================================================
--- labs/jbossweb/trunk/src/share/native/build/buildworld.bat	2006-05-11 10:59:43 UTC (rev 4194)
+++ labs/jbossweb/trunk/src/share/native/build/buildworld.bat	2006-05-11 11:05:06 UTC (rev 4195)
@@ -43,9 +43,9 @@
 set CPU=I386
 set OPENSSLBIN=buildsslasm %1
 @if "%usesdk%" == "1" (
+    call %PSDK5%\SetEnv /XP32 /RETAIL
+) else (
     call %MSVS8VC%\vcvars32
-) else (
-    call %PSDK5%\SetEnv /XP32 /RETAIL
 }
 goto cmdBuild
 
@@ -53,9 +53,9 @@
 set CPU=AMD64
 set OPENSSLBIN=buildsslamd64 %1
 @if "%usesdk%" == "1" (
+    call %PSDK5%\SetEnv /X64 /RETAIL
+) else (
     call %MSVS8VC%\amd64\vcvarsamd64
-) else (
-    call %PSDK5%\SetEnv /X64 /RETAIL
 }
 goto cmdBuild
 
@@ -63,9 +63,9 @@
 set CPU=IA64
 set OPENSSLBIN=buildsslia64 %1
 @if "%usesdk%" == "1" (
+    call %PSDK5%\SetEnv /SRV64 /RETAIL
+) else (
     call %MSVS8VC%\amd64\vcvarsamd64
-) else (
-    call %PSDK5%\SetEnv /SRV64 /RETAIL
 }
 goto cmdBuild
 

[Jboss-svn-commits] JBL Code SVN: r4194 - in labs/jbossweb/trunk/src/share/native: build srclib/openssl

[<jbo...@li...>]

Author: mla...@jb...
Date: 2006-05-11 06:59:43 -0400 (Thu, 11 May 2006)
New Revision: 4194

Added:
   labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslamd64.bat
   labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslia64.bat
Removed:
   labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslamd.bat
Modified:
   labs/jbossweb/trunk/src/share/native/build/buildworld.bat
Log:
Update buildworld for IA64 platform

Modified: labs/jbossweb/trunk/src/share/native/build/buildworld.bat
===================================================================
--- labs/jbossweb/trunk/src/share/native/build/buildworld.bat	2006-05-11 01:56:00 UTC (rev 4193)
+++ labs/jbossweb/trunk/src/share/native/build/buildworld.bat	2006-05-11 10:59:43 UTC (rev 4194)
@@ -11,14 +11,21 @@
 REM
 REM
 @if "%OS%" == "Windows_NT"  setlocal
-set MSVS8VC=C:\opt\MSVS8\VC\bin
+set MSVS8VC=C:\opt\msvs8\VC\bin
 REM set MSVS8VC=C:\D\Microsoft\MSVS8\VC\bin
+set PSDK5=C:\opt\psdk5
+REM PSDK5=C:\D\PSDK05
 
 set OPENSSLBIN=buildssl
 set OPENSSLVER=0.9.8b
 set APRVER=1.2.7
 set FLAVOR=DLL
 
+@if not "%1" == "sdk" goto checkFLAVOR
+shift
+set usesdk=1
+
+:checkFLAVOR
 @if /i "%1" == "dll" goto makeDLL
 set FLAVOR=STATIC
 goto checkCPU
@@ -35,15 +42,33 @@
 :cpuX86
 set CPU=I386
 set OPENSSLBIN=buildsslasm %1
-call %MSVS8VC%\vcvars32
+@if "%usesdk%" == "1" (
+    call %MSVS8VC%\vcvars32
+) else (
+    call %PSDK5%\SetEnv /XP32 /RETAIL
+}
 goto cmdBuild
 
 :cpuAMD64
 set CPU=AMD64
-set OPENSSLBIN=buildsslamd %1
-call %MSVS8VC%\amd64\vcvarsamd64
+set OPENSSLBIN=buildsslamd64 %1
+@if "%usesdk%" == "1" (
+    call %MSVS8VC%\amd64\vcvarsamd64
+) else (
+    call %PSDK5%\SetEnv /X64 /RETAIL
+}
 goto cmdBuild
 
+:cpuIA64
+set CPU=IA64
+set OPENSSLBIN=buildsslia64 %1
+@if "%usesdk%" == "1" (
+    call %MSVS8VC%\amd64\vcvarsamd64
+) else (
+    call %PSDK5%\SetEnv /SRV64 /RETAIL
+}
+goto cmdBuild
+
 :cmdBuild
 cd srclib/openssl-%OPENSSLVER%
 call %OPENSSLBIN% %1

Deleted: labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslamd.bat
===================================================================
--- labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslamd.bat	2006-05-11 01:56:00 UTC (rev 4193)
+++ labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslamd.bat	2006-05-11 10:59:43 UTC (rev 4194)
@@ -1,31 +0,0 @@
-@echo off
-REM
-REM JBoss, the OpenSource J2EE webOS
-REM
-REM Distributable under LGPL license.
-REM See terms of license at gnu.org.
-REM
-REM
-REM @author Mladen Turk
-REM @version $Revision: 1.0 $, $Date: 2005/07/12 14:56:09 $
-REM
-REM
-REM call vsvars32
-REM
-@if "%OS%" == "Windows_NT"  setlocal
-@rmdir /S /Q out32
-@rmdir /S /Q out32dll
-@rmdir /S /Q tmp32
-@rmdir /S /Q tmp32dll
-
-perl Configure VC-WIN64A
-call ms\do_win64a
-
-@if "%1" == "dll" goto DLL
-@goto LIB
-:DLL
-nmake -f ms\ntdll.mak
-@goto END
-:LIB
-nmake -f ms\nt.mak
-:END

Added: labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslamd64.bat
===================================================================
--- labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslamd64.bat	2006-05-11 01:56:00 UTC (rev 4193)
+++ labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslamd64.bat	2006-05-11 10:59:43 UTC (rev 4194)
@@ -0,0 +1,31 @@
+@echo off
+REM
+REM JBoss, the OpenSource J2EE webOS
+REM
+REM Distributable under LGPL license.
+REM See terms of license at gnu.org.
+REM
+REM
+REM @author Mladen Turk
+REM @version $Revision: 1.0 $, $Date: 2005/07/12 14:56:09 $
+REM
+REM
+REM call vsvars32
+REM
+@if "%OS%" == "Windows_NT"  setlocal
+@rmdir /S /Q out32
+@rmdir /S /Q out32dll
+@rmdir /S /Q tmp32
+@rmdir /S /Q tmp32dll
+
+perl Configure VC-WIN64A
+call ms\do_win64a
+
+@if "%1" == "dll" goto DLL
+@goto LIB
+:DLL
+nmake -f ms\ntdll.mak
+@goto END
+:LIB
+nmake -f ms\nt.mak
+:END

Added: labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslia64.bat
===================================================================
--- labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslia64.bat	2006-05-11 01:56:00 UTC (rev 4193)
+++ labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslia64.bat	2006-05-11 10:59:43 UTC (rev 4194)
@@ -0,0 +1,31 @@
+@echo off
+REM
+REM JBoss, the OpenSource J2EE webOS
+REM
+REM Distributable under LGPL license.
+REM See terms of license at gnu.org.
+REM
+REM
+REM @author Mladen Turk
+REM @version $Revision: 1.0 $, $Date: 2005/07/12 14:56:09 $
+REM
+REM
+REM call vsvars32
+REM
+@if "%OS%" == "Windows_NT"  setlocal
+@rmdir /S /Q out32
+@rmdir /S /Q out32dll
+@rmdir /S /Q tmp32
+@rmdir /S /Q tmp32dll
+
+perl Configure VC-WIN64I
+call ms\do_win64i
+
+@if "%1" == "dll" goto DLL
+@goto LIB
+:DLL
+nmake -f ms\ntdll.mak
+@goto END
+:LIB
+nmake -f ms\nt.mak
+:END

[Jboss-svn-commits] JBL Code SVN: r4193 - in labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools: . integrationtests

[<jbo...@li...>]

Author: mic...@jb...
Date: 2006-05-10 21:56:00 -0400 (Wed, 10 May 2006)
New Revision: 4193

Modified:
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/State.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/IntegrationCases.java
Log:
added a test

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/State.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/State.java	2006-05-10 23:37:21 UTC (rev 4192)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/State.java	2006-05-11 01:56:00 UTC (rev 4193)
@@ -7,7 +7,8 @@
     private PropertyChangeSupport changes = new PropertyChangeSupport( this );
 
     private String                state;
-
+    private boolean               flag;
+    
     public State(String state) {
         this.state = state;
     }
@@ -23,6 +24,8 @@
                                          oldState,
                                          newState );
     }
+    
+    
 
     public void addPropertyChangeListener(PropertyChangeListener l) {
         changes.addPropertyChangeListener( l );
@@ -31,4 +34,14 @@
     public void removePropertyChangeListener(PropertyChangeListener l) {
         changes.removePropertyChangeListener( l );
     }
+
+    public boolean isFlag() {
+        return flag;
+    }
+
+    public void setFlag(boolean flag) {
+        boolean old = this.flag;
+        this.flag = flag;
+        this.changes.firePropertyChange( "flag", old, flag );
+    }
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/IntegrationCases.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/IntegrationCases.java	2006-05-10 23:37:21 UTC (rev 4192)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/IntegrationCases.java	2006-05-11 01:56:00 UTC (rev 4193)
@@ -238,11 +238,16 @@
         
         assertEquals(1, list.size());
         
-        state.setState( "finished" );
+
+        state.setFlag( true );
         assertEquals(1, list.size());
         
         workingMemory.fireAllRules();
         assertEquals(2, list.size());
+        
+        state.setState( "finished" );
+        workingMemory.fireAllRules();
+        assertEquals(3, list.size());
 
     }    
 

[Jboss-svn-commits] JBL Code SVN: r4192 - in labs/jbosslabs/trunk/portal-extensions: counters-ejb3/src/java/org/jboss/forge/counters forge-common/src/java/org/jboss/forge/common/projects

[<jbo...@li...>]

Author: unibrew
Date: 2006-05-10 19:37:21 -0400 (Wed, 10 May 2006)
New Revision: 4192

Modified:
   labs/jbosslabs/trunk/portal-extensions/counters-ejb3/src/java/org/jboss/forge/counters/CountersEntity.java
   labs/jbosslabs/trunk/portal-extensions/counters-ejb3/src/java/org/jboss/forge/counters/CountersServiceBean.java
   labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/Counter.java
   labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/CountersService.java
   labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadCountersDB.java
   labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadCountersDescriptor.java
   labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadCountersWatcher.java
Log:
[JBLAB-665] Further working on counters' ejbs

Modified: labs/jbosslabs/trunk/portal-extensions/counters-ejb3/src/java/org/jboss/forge/counters/CountersEntity.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/counters-ejb3/src/java/org/jboss/forge/counters/CountersEntity.java	2006-05-10 21:00:36 UTC (rev 4191)
+++ labs/jbosslabs/trunk/portal-extensions/counters-ejb3/src/java/org/jboss/forge/counters/CountersEntity.java	2006-05-10 23:37:21 UTC (rev 4192)
@@ -43,16 +43,14 @@
     private String order;
     private String projectId;
     private boolean visible;
-    
-    public CountersEntity(String path) 
+        
+    public CountersEntity (String path, long initValue, String projectId, boolean visible, String order) 
     {
-        this(path,0L);
-    }
-    
-    public CountersEntity (String path, long initValue) 
-    {
         this.path = path;
         this.counterValue=initValue;
+        this.projectId = projectId;
+        this.visible = visible;
+        this.order = order;
     }
 
     @Id

Modified: labs/jbosslabs/trunk/portal-extensions/counters-ejb3/src/java/org/jboss/forge/counters/CountersServiceBean.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/counters-ejb3/src/java/org/jboss/forge/counters/CountersServiceBean.java	2006-05-10 21:00:36 UTC (rev 4191)
+++ labs/jbosslabs/trunk/portal-extensions/counters-ejb3/src/java/org/jboss/forge/counters/CountersServiceBean.java	2006-05-10 23:37:21 UTC (rev 4192)
@@ -48,12 +48,6 @@
     @PersistenceContext (unitName="counters")
     protected EntityManager em;
     
-    public void createCounterWithPath(String path) 
-    {
-        CountersEntity ce = new CountersEntity(path);
-        em.persist(ce);
-    }
-    
     public Map<String,Counter> getCountersMap() 
     {
         List<CountersEntity> countersRows = em.createQuery("from CountersEntity e").getResultList();
@@ -70,8 +64,34 @@
     }
     
     public void updateCounters(Map<String,Counter> downloadCounters) 
-    {
-        List<CountersEntity> countersRows = em.createQuery("from CountersEntity e").getResultList();
+    {        
+        
+        synchronized (downloadCounters) {
+            for (String path : downloadCounters.keySet()) 
+            {
+                Counter counter = downloadCounters.get(path);
+                CountersEntity ce = em.find(CountersEntity.class,path);
+                if (ce==null) 
+                {
+                    ce = new CountersEntity(path,counter.getValue(),counter.getProjectId(),counter.getVisible(),counter.getSorting().name());
+                    em.persist(ce);
+                } else { 
+                    ce.setCounterValue(counter.getValue());
+                    ce.setVisible(counter.getVisible());
+                    ce.setOrder(counter.getSorting().name());
+                    ce.setProjectId(counter.getProjectId());
+                }
+            }
+            List<String> pathsFromDB = em.createQuery("select path from CountersEntity e").getResultList();
+            for (String path : pathsFromDB) 
+            {
+                if (!downloadCounters.containsKey(path)) 
+                {
+                    em.remove(em.find(CountersEntity.class,path));
+                }
+            }
+            
+        }
     }
     
     public void incrementCounter (String path) 

Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/Counter.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/Counter.java	2006-05-10 21:00:36 UTC (rev 4191)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/Counter.java	2006-05-10 23:37:21 UTC (rev 4192)
@@ -71,7 +71,7 @@
 	/**
 	 * This method increments the value of the counter.
 	 */
-	void increment () {
+	public void increment () {
 		value++;
 	}
 	
@@ -80,7 +80,7 @@
 	 * 
 	 * @return Project id name for this counter.
 	 */
-	String getProjectId() {
+	public String getProjectId() {
 		return projectId;
 	}
 	
@@ -88,7 +88,7 @@
 	 * Method returns current value of the counter.
 	 * @return Current value of the counter.
 	 */
-	long getValue() {
+	public long getValue() {
 		return value;
 	}
 	
@@ -105,7 +105,7 @@
 	 * Method sets visibility of the counter.
 	 * @param visible
 	 */
-	void setVisible(Boolean visible) {
+	public void setVisible(Boolean visible) {
 		this.visible = visible;
 	}
 

Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/CountersService.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/CountersService.java	2006-05-10 21:00:36 UTC (rev 4191)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/CountersService.java	2006-05-10 23:37:21 UTC (rev 4192)
@@ -36,8 +36,6 @@
 @Local
 public interface CountersService
 {
-
-    public void createCounterWithPath(String path);
     
     public Map<String,Counter> getCountersMap();
     

Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadCountersDB.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadCountersDB.java	2006-05-10 21:00:36 UTC (rev 4191)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadCountersDB.java	2006-05-10 23:37:21 UTC (rev 4192)
@@ -52,7 +52,6 @@
     public DownloadCountersDB(String portalName, ContentManager cm)
     {
         super();
-        System.out.println("HALO!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!1");
         this.setContentManager(cm);
         try
         {
@@ -61,11 +60,12 @@
                 (CountersService) ctx.lookup(CountersService.class.getName());
             downloadCounters = countersService.getCountersMap();
 
+            // SOD
             for (String path : downloadCounters.keySet()) 
             {
-                System.out.println("Path: "+path+" Value: "+downloadCounters.get(path));
+                System.out.println("SOD 1 Path: "+path+" Value: "+downloadCounters.get(path));
             }
-
+            
             // Getting Map containing pairs of ProjectId and shotoku Node
             // which refers to projects' download counter descriptor.
             Map<String, org.jboss.shotoku.Node> descriptors =
@@ -75,9 +75,11 @@
             // projects download counter descriptors.
             synchronizeCounters(descriptors);
 
+
+            // SOD
             for (String path : downloadCounters.keySet()) 
             {
-                System.out.println("Path: "+path+" Value: "+downloadCounters.get(path));
+                System.out.println("SOD 2 Path: "+path+" Value: "+downloadCounters.get(path));
             }
 
         }
@@ -96,6 +98,13 @@
      */
     public void synchronizeWithFile(String portalName)
     {
+    
+        // SOD
+        for (String path : downloadCounters.keySet()) 
+        {
+            System.out.println("SOD 4 Path: "+path+" Value: "+downloadCounters.get(path));
+        }
+    
         try
         {
             CountersService countersService =

Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadCountersDescriptor.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadCountersDescriptor.java	2006-05-10 21:00:36 UTC (rev 4191)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadCountersDescriptor.java	2006-05-10 23:37:21 UTC (rev 4192)
@@ -245,6 +245,12 @@
 			removeLinksForProjects (projects);
 		}
 
+	    // SOD
+	    //for (String path : downloadCounters.keySet()) 
+	    //{
+	    //    System.out.println("SOD 3 Path: "+path+" Value: "+downloadCounters.get(path));
+	   // }
+
 		// Iterating through projects nodes containing download counter descriptors.
 		for (String projectId:counters.keySet()){
 			try {
@@ -284,6 +290,12 @@
 			
 		}
 		
+	    // SOD
+	   // for (String path : downloadCounters.keySet()) 
+	   // {
+	   //     System.out.println("SOD 5 Path: "+path+" Value: "+downloadCounters.get(path));
+	   // }
+                
 		// Changing status to false becouse downloadCounters Map
 		// is now synchronized with projects' download counter descriptors.
 		changeStatus=false;
@@ -297,10 +309,23 @@
 	 * 		List<String> of links which should be removed.
 	 */
 	private synchronized void removeLinksFromCounting (List<String> linksToDelete) {
+                
+	    // SOD
+	    for (String path : downloadCounters.keySet()) 
+	    {
+	        System.out.println("SOD 6 Path: "+path+" Value: "+downloadCounters.get(path));
+	    }
+                
 		// Removing links which shouldn't be tracked any more.
 		for (String link:linksToDelete) {
 			downloadCounters.remove(link);
 		}
+                
+	    // SOD
+	    for (String path : downloadCounters.keySet()) 
+	    {
+	        System.out.println("SOD 7 Path: "+path+" Value: "+downloadCounters.get(path));
+	    }
 	}
 	
 	/**
@@ -342,6 +367,13 @@
 	}
 	
 	private synchronized void removeLinksForProjects (Set<String> projects) {
+                
+	    // SOD
+	    for (String path : downloadCounters.keySet()) 
+	    {
+	        System.out.println("SOD 8 Path: "+path+" Value: "+downloadCounters.get(path));
+	    }
+        
 		Set<String> countersLinks = downloadCounters.keySet();
 		List<String> linksForRemoval = new LinkedList<String>();
 		for (String link: countersLinks) {
@@ -350,6 +382,12 @@
 			}
 		}
 		downloadCounters.keySet().removeAll(linksForRemoval);	
+                
+	    // SOD
+	    for (String path : downloadCounters.keySet()) 
+	    {
+	        System.out.println("SOD 9 Path: "+path+" Value: "+downloadCounters.get(path));
+	    }
 	}
 	
 	private synchronized Set<String> getTrackedProjects () {

Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadCountersWatcher.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadCountersWatcher.java	2006-05-10 21:00:36 UTC (rev 4191)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadCountersWatcher.java	2006-05-10 23:37:21 UTC (rev 4192)
@@ -53,7 +53,6 @@
 	 */
 	public DownloadCountersWatcher (ContentManager contentManager) {
 		this.contentManager = contentManager;
-	    //System.out.println("WATCHER!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
 	}
 	
 	
@@ -68,10 +67,7 @@
 	 * @param portalName
 	 * @return DownloadCountersDescriptor object.
 	 */
-	private Object getDescriptor (String portalName) {
-		
-                //System.out.println("GETDESCRIPTOR!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
-                
+	private Object getDescriptor (String portalName) {                
                 DownloadCountersDescriptor descriptor = 
 			new DownloadCountersDescriptor(portalName, contentManager);
 		rw = new ResourceWatcher(contentManager);
@@ -93,7 +89,6 @@
 	 * If the object is changed the method returns new object if not returns null.
 	 */
 	public Object nodeUpdate(String portalName, Object currentValue) {
-		//System.out.println("NODE UPDATE!!!!!!!!!!!!!!");
                 if (currentValue==null || rw.checkResources() 
 				|| !checkForNewResources((DownloadCountersDescriptor)currentValue,portalName)) {
 			return getDescriptor(portalName);

[Jboss-svn-commits] JBL Code SVN: r4191 - labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/svn

[<jbo...@li...>]

Author: wrzep
Date: 2006-05-10 17:00:36 -0400 (Wed, 10 May 2006)
New Revision: 4191

Modified:
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/svn/RevisionStatusPlugin.java
Log:
JBLAB-599
got rid of dbg msgs
Pawel


Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/svn/RevisionStatusPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/svn/RevisionStatusPlugin.java	2006-05-10 20:27:38 UTC (rev 4190)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/svn/RevisionStatusPlugin.java	2006-05-10 21:00:36 UTC (rev 4191)
@@ -39,16 +39,12 @@
 	protected int getPluginSpecyficValue(Object repository) {
 		SvnRepository repo = (SvnRepository) repository;
 		
-		System.out.println("revision " + repo.getRevision()
-				+ " / " + Long.valueOf(repo.getRevision()).intValue());
-		
 		return Long.valueOf(repo.getRevision()).intValue();
 		//TODO possible out of range
 	}
 	
 	@Override
 	protected int getPluginSpecyficDefaultValue() {
-		System.out.println("default value");
 		return 0;
 	}
 	

[Jboss-svn-commits] JBL Code SVN: r4190 - in labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status: service/impl service/model tools

[<jbo...@li...>]

Author: wrzep
Date: 2006-05-10 16:27:38 -0400 (Wed, 10 May 2006)
New Revision: 4190

Modified:
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/model/ScoresServiceLocal.java
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/model/ScoresServiceRemote.java
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java
Log:
JBLAB-599
Pawel


Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java	2006-05-10 14:13:27 UTC (rev 4189)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java	2006-05-10 20:27:38 UTC (rev 4190)
@@ -47,6 +47,8 @@
 import org.jboss.forge.status.exceptions.ScoresSaveException;
 import org.jboss.forge.status.service.model.PluginConf;
 import org.jboss.forge.status.service.model.ScoresService;
+import org.jboss.forge.status.service.model.ScoresServiceLocal;
+import org.jboss.forge.status.service.model.ScoresServiceRemote;
 import org.jboss.forge.status.tools.Plugins;
 import org.jboss.forge.status.tools.Tools;
 
@@ -64,9 +66,9 @@
 
 @Service(objectName=Tools.STATUS_SERVICE_NAME)
 @Management(ScoresService.class)
-@Local(ScoresService.class)
+@Local(ScoresServiceLocal.class)
 @LocalBinding(jndiBinding=Tools.STATUS_LOCAL_SERVICE)
-@Remote(ScoresService.class)
+@Remote(ScoresServiceRemote.class)
 @RemoteBinding(jndiBinding=Tools.STATUS_REMOTE_SERVICE)
 public class ScoresServiceImpl implements ScoresService {
 	

Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/model/ScoresServiceLocal.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/model/ScoresServiceLocal.java	2006-05-10 14:13:27 UTC (rev 4189)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/model/ScoresServiceLocal.java	2006-05-10 20:27:38 UTC (rev 4190)
@@ -22,24 +22,9 @@
 
 package org.jboss.forge.status.service.model;
 
-import java.util.Date;
-import java.util.List;
-
-import org.jboss.forge.common.projects.Projects;
-import org.jboss.forge.status.exceptions.GetScoresException;
-import org.jboss.forge.status.exceptions.ScoresSaveException;
-
 /**
 * @author Pawel Wrzeszcz (pawel.wrzeszcz [at] gmail.com)
 */
-public interface ScoresServiceLocal {
-	
-	public PluginsValues getPluginsValues(String portalName,
-			Date date) throws GetScoresException;
+public interface ScoresServiceLocal extends ScoresService {
 
-	public void save(Projects projects, List<PluginConf> pluginsConf,
-			String portalName) throws ScoresSaveException;
-
-	public PluginValues get(String portalName, String pluginId, Date date)
-							throws GetScoresException;
 }
\ No newline at end of file

Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/model/ScoresServiceRemote.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/model/ScoresServiceRemote.java	2006-05-10 14:13:27 UTC (rev 4189)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/model/ScoresServiceRemote.java	2006-05-10 20:27:38 UTC (rev 4190)
@@ -22,24 +22,9 @@
 
 package org.jboss.forge.status.service.model;
 
-import java.util.Date;
-import java.util.List;
-
-import org.jboss.forge.common.projects.Projects;
-import org.jboss.forge.status.exceptions.GetScoresException;
-import org.jboss.forge.status.exceptions.ScoresSaveException;
-
 /**
 * @author Pawel Wrzeszcz (pawel.wrzeszcz [at] gmail.com)
 */
-public interface ScoresServiceRemote {
+public interface ScoresServiceRemote extends ScoresService {
 	
-	public PluginsValues getPluginsValues(String portalName,
-			Date date) throws GetScoresException;
-
-	public void save(Projects projects, List<PluginConf> pluginsConf,
-			String portalName) throws ScoresSaveException;
-
-	public PluginValues get(String portalName, String pluginId, Date date)
-							throws GetScoresException;
 }
\ No newline at end of file

Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java	2006-05-10 14:13:27 UTC (rev 4189)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java	2006-05-10 20:27:38 UTC (rev 4190)
@@ -37,6 +37,8 @@
 import org.jboss.forge.status.service.model.PluginConf;
 import org.jboss.forge.status.service.model.PluginsValues;
 import org.jboss.forge.status.service.model.ScoresService;
+import org.jboss.forge.status.service.model.ScoresServiceLocal;
+import org.jboss.forge.status.service.model.ScoresServiceRemote;
 
 /**
 * @author Pawel Wrzeszcz (pawel.wrzeszcz [at] gmail.com)
@@ -132,8 +134,9 @@
 			
 		// Narrow the reference of the object returned by lookup() method
 		ScoresService service = 
-			(ScoresService) PortableRemoteObject.
-									narrow( ref, ScoresService.class);
+			(ScoresService) PortableRemoteObject.narrow( ref, 
+									(isRemote ? ScoresServiceRemote.class :
+												ScoresServiceLocal.class));
 		
 		return service;
 	}

[Jboss-svn-commits] JBL Code SVN: r4189 - labs/jbossweb/trunk/src/share/native/build

[<jbo...@li...>]

Author: jfr...@jb...
Date: 2006-05-10 10:13:27 -0400 (Wed, 10 May 2006)
New Revision: 4189

Modified:
   labs/jbossweb/trunk/src/share/native/build/buildphp.sh
Log:
Build on ia64 Linux (dev18).


Modified: labs/jbossweb/trunk/src/share/native/build/buildphp.sh
===================================================================
--- labs/jbossweb/trunk/src/share/native/build/buildphp.sh	2006-05-10 13:28:31 UTC (rev 4188)
+++ labs/jbossweb/trunk/src/share/native/build/buildphp.sh	2006-05-10 14:13:27 UTC (rev 4189)
@@ -95,6 +95,19 @@
             "
     ADDFLAGS="-I $JAVA_HOME/include/linux"
     ;;
+  dev18*)
+    EXTTYPE=static
+    ADDCONF="\
+            --with-jpeg-dir \
+            --with-png-dir \
+            --with-freetype-dir \
+            --with-t1lib \
+            \
+            --with-xpm-dir=no \
+            --with-t1lib=no \
+            "
+    ADDFLAGS="-I $JAVA_HOME/include/linux"
+    ;;
   *)
     EXTTYPE=static
     ADDCONF="\

[Jboss-svn-commits] JBL Code SVN: r4188 - in labs/jbossweb/trunk/src/share/native: . build php5servlet srclib/apr

[<jbo...@li...>]

Author: mla...@jb...
Date: 2006-05-10 09:28:31 -0400 (Wed, 10 May 2006)
New Revision: 4188

Modified:
   labs/jbossweb/trunk/src/share/native/NMAKEmakefile
   labs/jbossweb/trunk/src/share/native/build/NMAKEcommon.inc
   labs/jbossweb/trunk/src/share/native/php5servlet/NMAKEmakefile
   labs/jbossweb/trunk/src/share/native/srclib/apr/NMAKEmakefile
Log:
Update year to 2006

Modified: labs/jbossweb/trunk/src/share/native/NMAKEmakefile
===================================================================
--- labs/jbossweb/trunk/src/share/native/NMAKEmakefile	2006-05-10 13:19:19 UTC (rev 4187)
+++ labs/jbossweb/trunk/src/share/native/NMAKEmakefile	2006-05-10 13:28:31 UTC (rev 4188)
@@ -1,4 +1,4 @@
-# Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+# Copyright 2001-2006 The Apache Software Foundation or its licensors, as
 # applicable.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

Modified: labs/jbossweb/trunk/src/share/native/build/NMAKEcommon.inc
===================================================================
--- labs/jbossweb/trunk/src/share/native/build/NMAKEcommon.inc	2006-05-10 13:19:19 UTC (rev 4187)
+++ labs/jbossweb/trunk/src/share/native/build/NMAKEcommon.inc	2006-05-10 13:28:31 UTC (rev 4188)
@@ -1,4 +1,4 @@
-# Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+# Copyright 2001-2006 The Apache Software Foundation or its licensors, as
 # applicable.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -195,7 +195,7 @@
 # Linker section
 LIBS = kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib $(LIBS)
 !IF "$(CPU)" == "AMD64" || "$(CPU)" == "IA64"
-LIBS = $(LIBS) bufferoverflowu.lib 
+LIBS = $(LIBS) bufferoverflowu.lib
 !ENDIF
 
 !IF DEFINED(EXTRA_LIBS)

Modified: labs/jbossweb/trunk/src/share/native/php5servlet/NMAKEmakefile
===================================================================
--- labs/jbossweb/trunk/src/share/native/php5servlet/NMAKEmakefile	2006-05-10 13:19:19 UTC (rev 4187)
+++ labs/jbossweb/trunk/src/share/native/php5servlet/NMAKEmakefile	2006-05-10 13:28:31 UTC (rev 4188)
@@ -1,4 +1,4 @@
-# Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+# Copyright 2001-2006 The Apache Software Foundation or its licensors, as
 # applicable.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

Modified: labs/jbossweb/trunk/src/share/native/srclib/apr/NMAKEmakefile
===================================================================
--- labs/jbossweb/trunk/src/share/native/srclib/apr/NMAKEmakefile	2006-05-10 13:19:19 UTC (rev 4187)
+++ labs/jbossweb/trunk/src/share/native/srclib/apr/NMAKEmakefile	2006-05-10 13:28:31 UTC (rev 4188)
@@ -1,4 +1,4 @@
-# Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+# Copyright 2001-2006 The Apache Software Foundation or its licensors, as
 # applicable.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

[Jboss-svn-commits] JBL Code SVN: r4187 - labs/jbossweb/trunk/src/share/native/build

[<jbo...@li...>]

Author: mla...@jb...
Date: 2006-05-10 09:19:19 -0400 (Wed, 10 May 2006)
New Revision: 4187

Modified:
   labs/jbossweb/trunk/src/share/native/build/buildsvc.bat
Log:
Do not require the optional param

Modified: labs/jbossweb/trunk/src/share/native/build/buildsvc.bat
===================================================================
--- labs/jbossweb/trunk/src/share/native/build/buildsvc.bat	2006-05-10 13:18:00 UTC (rev 4186)
+++ labs/jbossweb/trunk/src/share/native/build/buildsvc.bat	2006-05-10 13:19:19 UTC (rev 4187)
@@ -16,14 +16,15 @@
 
 
 @if not "%1" == "d" goto checkCPU
+@shift
 @rmdir /S /Q jbosssvc 2>NUL
 svn export http://anonsvn.labs.jboss.com/labs/jbossweb/trunk/src/windows/native/service/jbosssvc
 svn export http://anonsvn.labs.jboss.com/labs/jbossweb/trunk/src/share/native/build jbosssvc/build
 
 :checkCPU
-@if /i "%2" == "x86" goto cpuX86
-@if /i "%2" == "amd64" goto cpuAMD64
-@if /i "%2" == "ia64" goto cpuIA64
+@if /i "%1" == "x86" goto cpuX86
+@if /i "%1" == "amd64" goto cpuAMD64
+@if /i "%1" == "ia64" goto cpuIA64
 echo Usage: buildsvc <CPU>
 goto cmdEnd
 

[Jboss-svn-commits] JBL Code SVN: r4186 - labs/jbossweb/trunk/src/share/native/build

[<jbo...@li...>]

Author: mla...@jb...
Date: 2006-05-10 09:18:00 -0400 (Wed, 10 May 2006)
New Revision: 4186

Modified:
   labs/jbossweb/trunk/src/share/native/build/buildsvc.bat
Log:
Use not for svn export

Modified: labs/jbossweb/trunk/src/share/native/build/buildsvc.bat
===================================================================
--- labs/jbossweb/trunk/src/share/native/build/buildsvc.bat	2006-05-10 13:16:30 UTC (rev 4185)
+++ labs/jbossweb/trunk/src/share/native/build/buildsvc.bat	2006-05-10 13:18:00 UTC (rev 4186)
@@ -15,7 +15,7 @@
 REM set MSVS8VC=C:\D\Microsoft\MSVS8\VC\bin
 
 
-@if /i "%1" == "src" goto checkCPU
+@if not "%1" == "d" goto checkCPU
 @rmdir /S /Q jbosssvc 2>NUL
 svn export http://anonsvn.labs.jboss.com/labs/jbossweb/trunk/src/windows/native/service/jbosssvc
 svn export http://anonsvn.labs.jboss.com/labs/jbossweb/trunk/src/share/native/build jbosssvc/build

[Jboss-svn-commits] JBL Code SVN: r4185 - labs/jbossweb/trunk/src/share/native/build

[<jbo...@li...>]

Author: mla...@jb...
Date: 2006-05-10 09:16:30 -0400 (Wed, 10 May 2006)
New Revision: 4185

Modified:
   labs/jbossweb/trunk/src/share/native/build/buildsvc.bat
Log:
Only checkout sources if checked is present.

Modified: labs/jbossweb/trunk/src/share/native/build/buildsvc.bat
===================================================================
--- labs/jbossweb/trunk/src/share/native/build/buildsvc.bat	2006-05-10 13:12:59 UTC (rev 4184)
+++ labs/jbossweb/trunk/src/share/native/build/buildsvc.bat	2006-05-10 13:16:30 UTC (rev 4185)
@@ -14,14 +14,16 @@
 set MSVS8VC=C:\opt\MSVS8\VC\bin
 REM set MSVS8VC=C:\D\Microsoft\MSVS8\VC\bin
 
+
+@if /i "%1" == "src" goto checkCPU
 @rmdir /S /Q jbosssvc 2>NUL
-
 svn export http://anonsvn.labs.jboss.com/labs/jbossweb/trunk/src/windows/native/service/jbosssvc
 svn export http://anonsvn.labs.jboss.com/labs/jbossweb/trunk/src/share/native/build jbosssvc/build
 
-@if /i "%1" == "x86" goto cpuX86
-@if /i "%1" == "amd64" goto cpuAMD64
-@if /i "%1" == "ia64" goto cpuIA64
+:checkCPU
+@if /i "%2" == "x86" goto cpuX86
+@if /i "%2" == "amd64" goto cpuAMD64
+@if /i "%2" == "ia64" goto cpuIA64
 echo Usage: buildsvc <CPU>
 goto cmdEnd
 

[Jboss-svn-commits] JBL Code SVN: r4184 - labs/jbossweb/trunk/src/share/native/build

[<jbo...@li...>]

Author: mla...@jb...
Date: 2006-05-10 09:12:59 -0400 (Wed, 10 May 2006)
New Revision: 4184

Modified:
   labs/jbossweb/trunk/src/share/native/build/buildsvc.bat
Log:
We don't need a flavor for service.

Modified: labs/jbossweb/trunk/src/share/native/build/buildsvc.bat
===================================================================
--- labs/jbossweb/trunk/src/share/native/build/buildsvc.bat	2006-05-10 13:01:53 UTC (rev 4183)
+++ labs/jbossweb/trunk/src/share/native/build/buildsvc.bat	2006-05-10 13:12:59 UTC (rev 4184)
@@ -19,11 +19,9 @@
 svn export http://anonsvn.labs.jboss.com/labs/jbossweb/trunk/src/windows/native/service/jbosssvc
 svn export http://anonsvn.labs.jboss.com/labs/jbossweb/trunk/src/share/native/build jbosssvc/build
 
-@if /i "%1" == "dll" set FORDLL=1
-
-@if /i "%2" == "x86" goto cpuX86
-@if /i "%2" == "amd64" goto cpuAMD64
-@if /i "%2" == "ia64" goto cpuIA64
+@if /i "%1" == "x86" goto cpuX86
+@if /i "%1" == "amd64" goto cpuAMD64
+@if /i "%1" == "ia64" goto cpuIA64
 echo Usage: buildsvc <CPU>
 goto cmdEnd
 

[Jboss-svn-commits] JBL Code SVN: r4183 - in labs/jbossweb/trunk/src/share/native: build php5servlet

[<jbo...@li...>]

Author: mla...@jb...
Date: 2006-05-10 09:01:53 -0400 (Wed, 10 May 2006)
New Revision: 4183

Added:
   labs/jbossweb/trunk/src/share/native/php5servlet/php5servlet.rc
Modified:
   labs/jbossweb/trunk/src/share/native/build/buildsvc.bat
   labs/jbossweb/trunk/src/share/native/build/buildworld.bat
Log:
Be case insensitive

Modified: labs/jbossweb/trunk/src/share/native/build/buildsvc.bat
===================================================================
--- labs/jbossweb/trunk/src/share/native/build/buildsvc.bat	2006-05-10 12:52:30 UTC (rev 4182)
+++ labs/jbossweb/trunk/src/share/native/build/buildsvc.bat	2006-05-10 13:01:53 UTC (rev 4183)
@@ -19,11 +19,11 @@
 svn export http://anonsvn.labs.jboss.com/labs/jbossweb/trunk/src/windows/native/service/jbosssvc
 svn export http://anonsvn.labs.jboss.com/labs/jbossweb/trunk/src/share/native/build jbosssvc/build
 
-@if "%1" == "dll" set FORDLL=1
+@if /i "%1" == "dll" set FORDLL=1
 
-@if "%2" == "x86" goto cpuX86
-@if "%2" == "amd64" goto cpuAMD64
-@if "%2" == "ia64" goto cpuIA64
+@if /i "%2" == "x86" goto cpuX86
+@if /i "%2" == "amd64" goto cpuAMD64
+@if /i "%2" == "ia64" goto cpuIA64
 echo Usage: buildsvc <CPU>
 goto cmdEnd
 

Modified: labs/jbossweb/trunk/src/share/native/build/buildworld.bat
===================================================================
--- labs/jbossweb/trunk/src/share/native/build/buildworld.bat	2006-05-10 12:52:30 UTC (rev 4182)
+++ labs/jbossweb/trunk/src/share/native/build/buildworld.bat	2006-05-10 13:01:53 UTC (rev 4183)
@@ -19,16 +19,16 @@
 set APRVER=1.2.7
 set FLAVOR=DLL
 
-@if "%1" == "dll" goto makeDLL
+@if /i "%1" == "dll" goto makeDLL
 set FLAVOR=STATIC
 goto checkCPU
 :makeDLL
 set FLAVOR=DLL
 
 :checkCPU
-@if "%2" == "x86" goto cpuX86
-@if "%2" == "amd64" goto cpuAMD64
-@if "%2" == "ia64" goto cpuIA64
+@if /i "%2" == "x86" goto cpuX86
+@if /i "%2" == "amd64" goto cpuAMD64
+@if /i "%2" == "ia64" goto cpuIA64
 echo Usage: buildworld <CPU>
 goto cmdEnd
 

Added: labs/jbossweb/trunk/src/share/native/php5servlet/php5servlet.rc
===================================================================
--- labs/jbossweb/trunk/src/share/native/php5servlet/php5servlet.rc	2006-05-10 12:52:30 UTC (rev 4182)
+++ labs/jbossweb/trunk/src/share/native/php5servlet/php5servlet.rc	2006-05-10 13:01:53 UTC (rev 4183)
@@ -0,0 +1,80 @@
+/*
+ * JBoss, the OpenSource webOS
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+
+#include <windows.h>
+
+#define PRODUCT_VER_STRING "1.0.1.0\0"
+
+#define STR_COPYRIGHT       "Copyright  2006 JBoss inc. " \
+                            "or its licensors, as applicable."
+
+#define STR_LICENSE         "Distributable under LGPL license. " \
+                            "See terms of license at gnu.org."
+
+#define STR_COMPANY         "JBoss, Inc."
+#define STR_TRADEMARK       " JBoss Inc."
+#define STR_PRODUCT         "PHP5 Servlet SAPI"
+#define STR_VERISON         "1.0.1.0"
+#define CSV_VERISON         1,0,1,0
+
+#define PRIVATE_BUILD       0
+#define PRERELEASE_BUILD    0
+
+#if PRIVATE_BUILD
+#define STR_PRIVATE   "Initial Prerelease"
+#define STR_SPECIAL   "Basic functionality"
+#define STD_FILEFLAGS VS_FF_PRIVATEBUILD | VS_FF_SPECIALBUILD
+#else
+#define STD_FILEFLAGS 0x0L
+#endif
+
+#if RERELEASE_BUILD
+#define PSTD_FILEFLAGS STD_FILEFLAGS | VS_FF_PRERELEASE
+#else
+#define PSTD_FILEFLAGS STD_FILEFLAGS
+#endif
+
+#ifdef _DEBUG
+#define APP_FILEFLAGS STD_FILEFLAGS | VS_FF_DEBUG
+#else
+#define APP_FILEFLAGS STD_FILEFLAGS
+#endif
+
+1 VERSIONINFO
+ FILEVERSION CSV_VERISON
+ PRODUCTVERSION CSV_VERISON
+ FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+ FILEFLAGS APP_FILEFLAGS
+ FILEOS VOS_NT
+ FILETYPE VFT_DLL
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "Comments",  STR_LICENSE "\0"
+            VALUE "CompanyName", STR_COMPANY "\0"
+            VALUE "FileDescription", "PHP5 Servlet SAPI Module\0"
+            VALUE "FileVersion", STR_VERISON "\0"
+            VALUE "InternalName", "php5servlet"
+            VALUE "LegalCopyright", STR_COPYRIGHT "\0"
+            VALUE "LegalTrademarks", STR_TRADEMARK "\0"
+            VALUE "OriginalFilename", "php5servlet.dll"
+            VALUE "ProductName", STR_PRODUCT "\0"
+            VALUE "ProductVersion", STR_VERISON "\0"
+#if PRIVATE_BUILD
+            VALUE "PrivateBuild", STR_PRIVATE "\0"
+            VALUE "SpecialBuild", STR_SPECIAL "\0"
+#endif
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END

[Jboss-svn-commits] JBL Code SVN: r4182 - in labs/jbossweb/trunk/src: share/native windows/native/service/jbosssvc

[<jbo...@li...>]

Author: mla...@jb...
Date: 2006-05-10 08:52:30 -0400 (Wed, 10 May 2006)
New Revision: 4182

Modified:
   labs/jbossweb/trunk/src/share/native/NMAKEmakefile
   labs/jbossweb/trunk/src/windows/native/service/jbosssvc/NMAKEmakefile
Log:
Adjust the build native dirs

Modified: labs/jbossweb/trunk/src/share/native/NMAKEmakefile
===================================================================
--- labs/jbossweb/trunk/src/share/native/NMAKEmakefile	2006-05-10 12:47:33 UTC (rev 4181)
+++ labs/jbossweb/trunk/src/share/native/NMAKEmakefile	2006-05-10 12:52:30 UTC (rev 4182)
@@ -131,7 +131,7 @@
 	@$(CLEANTARGET)
 
 !IFNDEF INSTALLDIR
-INSTALLDIR = ../native-builds/$(BUILDIR)
+INSTALLDIR = ../native-builds/windows-%CPU%/bin/native
 !ENDIF
 
 !IFDEF STATIC

Modified: labs/jbossweb/trunk/src/windows/native/service/jbosssvc/NMAKEmakefile
===================================================================
--- labs/jbossweb/trunk/src/windows/native/service/jbosssvc/NMAKEmakefile	2006-05-10 12:47:33 UTC (rev 4181)
+++ labs/jbossweb/trunk/src/windows/native/service/jbosssvc/NMAKEmakefile	2006-05-10 12:52:30 UTC (rev 4182)
@@ -63,12 +63,8 @@
 	@$(CLEANTARGET)
 
 !IFNDEF INSTALLDIR
-!IFDEF FORDLL
-INSTALLDIR = ../../native-builds/WINNT_$(CPU)_DLL_RELEASE
-!ELSE
-INSTALLDIR = ../../native-builds/WINNT_$(CPU)_LIB_RELEASE
+INSTALLDIR = ../../native-builds/windows-%CPU%/bin
 !ENDIF
-!ENDIF
 
 install: all
     @gmkdir -p $(INSTALLDIR)

[Jboss-svn-commits] JBL Code SVN: r4181 - labs/jbossweb/trunk/src/share/native/build

[<jbo...@li...>]

Author: mla...@jb...
Date: 2006-05-10 08:47:33 -0400 (Wed, 10 May 2006)
New Revision: 4181

Modified:
   labs/jbossweb/trunk/src/share/native/build/buildsvc.bat
Log:
Use correct path for VS2005

Modified: labs/jbossweb/trunk/src/share/native/build/buildsvc.bat
===================================================================
--- labs/jbossweb/trunk/src/share/native/build/buildsvc.bat	2006-05-10 12:41:12 UTC (rev 4180)
+++ labs/jbossweb/trunk/src/share/native/build/buildsvc.bat	2006-05-10 12:47:33 UTC (rev 4181)
@@ -11,8 +11,8 @@
 REM
 REM
 @if "%OS%" == "Windows_NT"  setlocal
-REM set MSVS8VC=C:\opt\MSVS8\VC\bin
-set MSVS8VC=C:\D\Microsoft\MSVS8\VC\bin
+set MSVS8VC=C:\opt\MSVS8\VC\bin
+REM set MSVS8VC=C:\D\Microsoft\MSVS8\VC\bin
 
 @rmdir /S /Q jbosssvc 2>NUL
 

[Jboss-svn-commits] JBL Code SVN: r4180 - labs/jbossweb/trunk/src/share/native/build

[<jbo...@li...>]

Author: mla...@jb...
Date: 2006-05-10 08:41:12 -0400 (Wed, 10 May 2006)
New Revision: 4180

Modified:
   labs/jbossweb/trunk/src/share/native/build/buildprep.bat
   labs/jbossweb/trunk/src/share/native/build/buildprep.sh
Log:
Added svc to prepare.

Modified: labs/jbossweb/trunk/src/share/native/build/buildprep.bat
===================================================================
--- labs/jbossweb/trunk/src/share/native/build/buildprep.bat	2006-05-10 12:40:09 UTC (rev 4179)
+++ labs/jbossweb/trunk/src/share/native/build/buildprep.bat	2006-05-10 12:41:12 UTC (rev 4180)
@@ -45,6 +45,7 @@
 cd ..
 
 cp ./buildworld.bat %NATIVEDIST%/
+cp ./buildsvc.bat %NATIVEDIST%/
 cp ./NMAKEcommon.inc %NATIVEDIST%/build/
 cp ../NMAKEmakefile %NATIVEDIST%/
 cp ../srclib/apr/NMAKEmakefile %NATIVEDIST%/srclib/apr-%APRVER%/

Modified: labs/jbossweb/trunk/src/share/native/build/buildprep.sh
===================================================================
--- labs/jbossweb/trunk/src/share/native/build/buildprep.sh	2006-05-10 12:40:09 UTC (rev 4179)
+++ labs/jbossweb/trunk/src/share/native/build/buildprep.sh	2006-05-10 12:41:12 UTC (rev 4180)
@@ -63,6 +63,7 @@
 cd ..
 cp ./buildworld.sh ${NATIVEDIST}/
 cp ./buildworld.bat ${NATIVEDIST}/
+cp ./buildsvc.bat ${NATIVEDIST}/
 cp ./NMAKEcommon.inc ${NATIVEDIST}/build/
 cp ../NMAKEmakefile ${NATIVEDIST}/
 cp ../srclib/apr/NMAKEmakefile ${NATIVEDIST}/srclib/apr-${APRVER}/