jboss-svn-commits — JBoss SVN commit notifications

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

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

Author: mla...@jb...
Date: 2006-04-14 12:43:36 -0400 (Fri, 14 Apr 2006)
New Revision: 3716

Added:
   labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslamd.bat
   labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslasm.bat
Modified:
   labs/jbossweb/trunk/src/share/native/srclib/apr/NMAKEmakefile
   labs/jbossweb/trunk/src/share/native/srclib/openssl/buildssl.bat
Log:
Add manifests to openssl and APR.

Modified: labs/jbossweb/trunk/src/share/native/srclib/apr/NMAKEmakefile
===================================================================
--- labs/jbossweb/trunk/src/share/native/srclib/apr/NMAKEmakefile	2006-04-14 15:39:37 UTC (rev 3715)
+++ labs/jbossweb/trunk/src/share/native/srclib/apr/NMAKEmakefile	2006-04-14 16:43:36 UTC (rev 3716)
@@ -116,6 +116,7 @@
 BUILDLIB = $(BUILDIR)\$(PROJECT).dll
 BUILDPDB = $(BUILDIR)\$(PROJECT).pdb
 BUILDRES = $(BUILDIR)\$(PROJECT).res
+BUILDMAN = $(BUILDLIB).manifest
 !ELSE
 BUILDLIB = $(BUILDIR)\$(PROJECT).lib
 !ENDIF
@@ -201,6 +202,7 @@
 	$(RC) $(RCFLAGS) /i "$(SRCDIR)/include" /d "APR_VERSION_ONLY" /fo $(BUILDRES) libapr.rc
 $(BUILDLIB): $(BUILDIR) $(SRCDIR)/include/apr.h $(OBJECTS) $(BUILDRES)
 	$(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) /pdb:$(BUILDPDB) /out:$(BUILDLIB)
+	mt -nologo -manifest $(BUILDMAN) -outputresource:$(BUILDLIB);2
 !ELSE
 $(BUILDLIB): $(BUILDIR) $(SRCDIR)/include/apr.h $(OBJECTS)
 	$(LINK) $(LFLAGS) $(OBJECTS) /out:$(BUILDLIB)

Modified: labs/jbossweb/trunk/src/share/native/srclib/openssl/buildssl.bat
===================================================================
--- labs/jbossweb/trunk/src/share/native/srclib/openssl/buildssl.bat	2006-04-14 15:39:37 UTC (rev 3715)
+++ labs/jbossweb/trunk/src/share/native/srclib/openssl/buildssl.bat	2006-04-14 16:43:36 UTC (rev 3716)
@@ -4,15 +4,32 @@
 REM
 REM Distributable under LGPL license.
 REM See terms of license at gnu.org.
-REM 
 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
+@set PATH=%CD%;%PATH%
+
 perl Configure VC-NT
 call ms\do_nt
+
+@if "%1" == "dll" goto doDLL
+goto doLIB
+
+:doDLL
 nmake -f ms\ntdll.mak
+mt -nologo -manifest out32dll\libeay32.dll.manifest -outputresource:out32dll\libeay32.dll;2
+mt -nologo -manifest out32dll\ssleay32.dll.manifest -outputresource:out32dll\ssleay32.dll;2
+mt -nologo -manifest out32dll\openssl.exe.manifest -outputresource:out32dll\openssl.exe;1
+goto doEND
+
+:doLIB
 nmake -f ms\nt.mak
+
+:doEND

Added: labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslamd.bat
===================================================================
--- labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslamd.bat	2006-04-14 15:39:37 UTC (rev 3715)
+++ labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslamd.bat	2006-04-14 16:43:36 UTC (rev 3716)
@@ -0,0 +1,35 @@
+@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
+@set PATH=%CD%;%PATH%
+
+perl Configure VC-WIN64A
+call ms\do_win64a
+
+
+@if "%1" == "dll" goto doDLL
+goto doLIB
+
+:doDLL
+nmake -f ms\ntdll.mak
+mt -nologo -manifest out32dll\libeay32.dll.manifest -outputresource:out32dll\libeay32.dll;2
+mt -nologo -manifest out32dll\ssleay32.dll.manifest -outputresource:out32dll\ssleay32.dll;2
+mt -nologo -manifest out32dll\openssl.exe.manifest -outputresource:out32dll\openssl.exe;1
+goto doEND
+
+:doLIB
+nmake -f ms\nt.mak
+
+:doEND

Added: labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslasm.bat
===================================================================
--- labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslasm.bat	2006-04-14 15:39:37 UTC (rev 3715)
+++ labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslasm.bat	2006-04-14 16:43:36 UTC (rev 3716)
@@ -0,0 +1,34 @@
+@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
+@set PATH=%CD%;%PATH%
+
+perl Configure VC-NT
+call ms\do_masm
+
+@if "%1" == "dll" goto doDLL
+goto doLIB
+
+:doDLL
+nmake -f ms\ntdll.mak
+mt -nologo -manifest out32dll\libeay32.dll.manifest -outputresource:out32dll\libeay32.dll;2
+mt -nologo -manifest out32dll\ssleay32.dll.manifest -outputresource:out32dll\ssleay32.dll;2
+mt -nologo -manifest out32dll\openssl.exe.manifest -outputresource:out32dll\openssl.exe;1
+goto doEND
+
+:doLIB
+nmake -f ms\nt.mak
+
+:doEND

[Jboss-svn-commits] JBL Code SVN: r3715 - in labs/jbossrules/trunk/drools-core/src: main/java/org/drools/leaps main/java/org/drools/leaps/util test/java/org/drools/leaps/util

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

Author: bagerman
Date: 2006-04-14 11:39:37 -0400 (Fri, 14 Apr 2006)
New Revision: 3715

Modified:
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/leaps/FactHandleImpl.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/leaps/LeapsAgenda.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/leaps/LeapsRule.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/leaps/LeapsTuple.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/leaps/Token.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/leaps/TokenEvaluator.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/leaps/WorkingMemoryImpl.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/leaps/util/TableIterator.java
   labs/jbossrules/trunk/drools-core/src/test/java/org/drools/leaps/util/TableIteratorTest.java
Log:
leaps processing of exists and not made lazy

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/leaps/FactHandleImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/leaps/FactHandleImpl.java	2006-04-14 15:12:06 UTC (rev 3714)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/leaps/FactHandleImpl.java	2006-04-14 15:39:37 UTC (rev 3715)
@@ -31,9 +31,7 @@
  * @author Alexander Bagerman
  * 
  */
-public class FactHandleImpl extends Handle
-    implements
-    InternalFactHandle {
+public class FactHandleImpl extends Handle implements InternalFactHandle {
     private Set     activatedTuples   = null;
 
     private List    notTuples         = null;
@@ -50,85 +48,79 @@
      * actual object that is asserted to the system no getters just a direct
      * access to speed things up
      */
-    public FactHandleImpl(long id,
-                          Object object) {
-        super( id,
-               object );
+    public FactHandleImpl(long id, Object object) {
+        super(id, object);
     }
 
     void addActivatedTuple(LeapsTuple tuple) {
-        if ( this.activatedTuples == null ) {
+        if (this.activatedTuples == null) {
             this.activatedTuples = new HashSet();
         }
-        this.activatedTuples.add( tuple );
+        this.activatedTuples.add(tuple);
     }
 
-    void addNotTuple(LeapsTuple tuple,
-                     int index) {
-        if ( this.notTuples == null ) {
+    void addNotTuple(LeapsTuple tuple, int index) {
+        if (this.notTuples == null) {
             this.notTuples = new LinkedList();
         }
-        this.notTuples.add( new FactHandleTupleAssembly( tuple,
-                                                         index ) );
+        this.notTuples.add(new FactHandleTupleAssembly(tuple, index));
     }
 
-    void addExistsTuple(LeapsTuple tuple,
-                        int index) {
-        if ( this.existsTuples == null ) {
+    void addExistsTuple(LeapsTuple tuple, int index) {
+        if (this.existsTuples == null) {
             this.existsTuples = new LinkedList();
         }
-        this.existsTuples.add( new FactHandleTupleAssembly( tuple,
-                                                            index ) );
+        this.existsTuples.add(new FactHandleTupleAssembly(tuple, index));
     }
 
     Iterator getActivatedTuples() {
-        if ( this.activatedTuples != null ) {
+        if (this.activatedTuples != null) {
             return this.activatedTuples.iterator();
         }
         return null;
     }
 
-    Iterator getNotTuples() {
-        if ( this.notTuples != null ) {
+    Iterator getNotTupleAssemblies() {
+        if (this.notTuples != null) {
             return this.notTuples.iterator();
         }
         return null;
     }
 
-    Iterator getExistsTuples() {
-        if ( this.existsTuples != null ) {
+    Iterator getExistsTupleAssemblies() {
+        if (this.existsTuples != null) {
             return this.existsTuples.iterator();
         }
         return null;
     }
 
     void addLogicalDependency(LeapsTuple tuple) {
-        if ( this.logicalJustifiers == null ) {
+        if (this.logicalJustifiers == null) {
             this.logicalyDependent = true;
             this.logicalJustifiers = new HashSet();
         }
-        this.logicalJustifiers.add( tuple );
+        this.logicalJustifiers.add(tuple);
 
         this.dependencyCount++;
     }
 
     void removeLogicalDependency(LeapsTuple tuple) {
-        if ( this.dependencyCount > 0 ) {
-            this.logicalJustifiers.remove( tuple );
+        if (this.dependencyCount > 0) {
+            this.logicalJustifiers.remove(tuple);
         }
         this.dependencyCount--;
     }
 
     void removeAllLogicalDependencies() {
-        if ( this.dependencyCount > 0 ) {
-            for ( Iterator it = this.logicalJustifiers.iterator(); it.hasNext(); ) {
-                this.removeLogicalDependency( (LeapsTuple) it.next() );
+        if (this.dependencyCount > 0) {
+            for (Iterator it = this.logicalJustifiers.iterator(); it.hasNext();) {
+                this.removeLogicalDependency((LeapsTuple) it.next());
             }
         }
     }
 
     boolean isLogicalyValid() {
-        if ( this.logicalyDependent ) {
+        if (this.logicalyDependent) {
             return this.dependencyCount != 0;
         }
         return true;
@@ -148,3 +140,6 @@
         return toExternalForm();
     }
 }
+
+
+

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/leaps/LeapsAgenda.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/leaps/LeapsAgenda.java	2006-04-14 15:12:06 UTC (rev 3714)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/leaps/LeapsAgenda.java	2006-04-14 15:39:37 UTC (rev 3715)
@@ -44,14 +44,18 @@
             this.workingMemory.addToQueryResults( activation.getRule().getName(),
                                                   activation.getTuple() );
         } else {
-            // fire regular rule
-            super.fireActivation( activation );
-            // and remove tuple from
+            // remove tuple from fact tables, we do it first so assert and retract 
+            // in rule does not touch this tuple
             LeapsTuple tuple = (LeapsTuple) activation.getTuple();
             Class[] classes = tuple.getLeapsRule().getExistsNotColumnsClasses();
             for ( int i = 0, length = classes.length; i < length; i++ ) {
                 workingMemory.getFactTable( classes[i] ).removeTuple( tuple );
             }
+            // fire regular rule
+            super.fireActivation( activation );
         }
     }
 }
+
+
+

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/leaps/LeapsRule.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/leaps/LeapsRule.java	2006-04-14 15:12:06 UTC (rev 3714)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/leaps/LeapsRule.java	2006-04-14 15:39:37 UTC (rev 3715)
@@ -31,7 +31,7 @@
  * 
  */
 class LeapsRule {
-    Rule rule;
+    Rule                      rule;
 
     final ColumnConstraints[] columnConstraints;
 
@@ -39,11 +39,11 @@
 
     final ColumnConstraints[] existsColumnConstraints;
 
-    final EvalCondition[] evalConditions;
+    final EvalCondition[]     evalConditions;
 
-    boolean notColumnsPresent;
+    boolean                   notColumnsPresent;
 
-    boolean existsColumnsPresent;
+    boolean                   existsColumnsPresent;
 
     boolean evalCoditionsPresent;
 
@@ -66,7 +66,7 @@
 
         ArrayList classes = new ArrayList();
         for (int i = 0; i < this.notColumnConstraints.length; i++) {
-            if (classes.contains(this.notColumnConstraints[i].getClassType())) {
+            if (!classes.contains(this.notColumnConstraints[i].getClassType())) {
                 classes.add(this.notColumnConstraints[i].getClassType());
             }
         }
@@ -168,5 +168,7 @@
     public void setAgendaGroup(AgendaGroupImpl agendaGroup) {
         this.agendaGroup = agendaGroup;
     }
+}
 
-}
+
+

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/leaps/LeapsTuple.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/leaps/LeapsTuple.java	2006-04-14 15:12:06 UTC (rev 3714)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/leaps/LeapsTuple.java	2006-04-14 15:39:37 UTC (rev 3715)
@@ -33,42 +33,48 @@
  * @author Alexander Bagerman
  */
 class LeapsTuple implements Tuple, Serializable {
-    private static final long serialVersionUID = 1L;
+    private static final long        serialVersionUID       = 1L;
 
     private final PropagationContext context;
 
-    private boolean readyForActivation;
+    private boolean                  readyForActivation;
 
-    private final FactHandleImpl[] factHandles;
+    private final FactHandleImpl[]   factHandles;
 
-    private Set[] notFactHandles;
+    private FactHandleImpl[]         blockingNotFactHandles = null;
 
-    private Set[] existsFactHandles;
+    private FactHandleImpl[]         existsFactHandles      = null;
 
-    private Set logicalDependencies;
+    private Set                      logicalDependencies;
 
-    private Activation activation;
+    private Activation               activation;
 
-    private final LeapsRule leapsRule;
+    private final LeapsRule          leapsRule;
 
     /**
      * agendaItem parts
      */
-    LeapsTuple(FactHandleImpl factHandles[], LeapsRule leapsRule,
-            PropagationContext context) {
+    LeapsTuple(FactHandleImpl factHandles[], LeapsRule leapsRule, PropagationContext context) {
         this.factHandles = factHandles;
         this.leapsRule = leapsRule;
         this.context = context;
 
-        if (this.leapsRule != null && this.leapsRule.containsNotColumns()) {
-            this.notFactHandles = new HashSet[this.leapsRule
-                    .getNotColumnConstraints().length];
+        if (this.leapsRule != null) {
+            if (this.leapsRule.containsNotColumns()) {
+                this.blockingNotFactHandles = new FactHandleImpl[this.leapsRule
+                        .getNotColumnConstraints().length];
+                for (int i = 0; i < this.blockingNotFactHandles.length; i++) {
+                    this.blockingNotFactHandles[i] = null;
+                }
+            }
+            if (this.leapsRule.containsExistsColumns()) {
+                this.existsFactHandles = new FactHandleImpl[this.leapsRule
+                        .getExistsColumnConstraints().length];
+                for (int i = 0; i < this.existsFactHandles.length; i++) {
+                    this.existsFactHandles[i] = null;
+                }
+            }
         }
-        if (this.leapsRule != null && this.leapsRule.containsExistsColumns()) {
-            this.existsFactHandles = new HashSet[this.leapsRule
-                    .getExistsColumnConstraints().length];
-        }
-
         this.readyForActivation = (this.leapsRule == null || !this.leapsRule
                 .containsExistsColumns());
     }
@@ -193,76 +199,56 @@
         if (this.existsFactHandles != null) {
             buffer.append("\nExists fact handles by position");
             for (int i = 0, length = this.existsFactHandles.length; i < length; i++) {
-                buffer.append("\nposition " + i);
-                for (Iterator it = this.existsFactHandles[i].iterator(); it
-                        .hasNext();) {
-                    buffer.append("\n\t" + it.next());
-                }
+                buffer.append("\nposition " + i).append(this.existsFactHandles[i]);
             }
         }
-        if (this.notFactHandles != null) {
-            buffer.append("\nNot fact handles by position");
-            for (int i = 0, length = this.notFactHandles.length; i < length; i++) {
-                buffer.append("\nposition " + i);
-                for (Iterator it = this.notFactHandles[i].iterator(); it
-                        .hasNext();) {
-                    buffer.append("\n\t" + it.next());
-                }
+        if (this.blockingNotFactHandles != null) {
+            buffer.append("\nblockingNot fact handles by position");
+            for (int i = 0, length = this.blockingNotFactHandles.length; i < length; i++) {
+                buffer.append("\nposition " + i).append(this.blockingNotFactHandles[i]);
             }
         }
+
         return buffer.toString();
     }
 
-    void addNotFactHandle(FactHandle factHandle, int index) {
+    void setBlockingNotFactHandle(FactHandleImpl factHandle, int index) {
         this.readyForActivation = false;
-        Set facts = this.notFactHandles[index];
-        if (facts == null) {
-            facts = new HashSet();
-            this.notFactHandles[index] = facts;
-        }
-        facts.add(factHandle);
+        this.blockingNotFactHandles[index] = factHandle;
     }
 
-    void removeNotFactHandle(FactHandle factHandle, int index) {
-        if (this.notFactHandles[index] != null) {
-            this.notFactHandles[index].remove(factHandle);
-        }
+    void removeBlockingNotFactHandle(int index) {
+        this.blockingNotFactHandles[index] = null;
         this.setReadyForActivation();
     }
 
-    void addExistsFactHandle(FactHandle factHandle, int index) {
-        Set facts = this.existsFactHandles[index];
-        if (facts == null) {
-            facts = new HashSet();
-            this.existsFactHandles[index] = facts;
-        }
-        facts.add(factHandle);
+    void setExistsFactHandle(FactHandleImpl factHandle, int index) {
+        this.existsFactHandles[index] = factHandle;
         this.setReadyForActivation();
     }
 
-    void removeExistsFactHandle(FactHandle factHandle, int index) {
-        if (this.existsFactHandles[index] != null) {
-            this.existsFactHandles[index].remove(factHandle);
-        }
+    void removeExistsFactHandle(int index) {
+        this.existsFactHandles[index] = null;
         this.setReadyForActivation();
     }
 
     private void setReadyForActivation() {
         this.readyForActivation = true;
 
-        if (this.notFactHandles != null) {
-            for (int i = 0, length = this.notFactHandles.length; i < length
-                    && this.readyForActivation; i++) {
-                if (this.notFactHandles[i].size() > 0) {
+        if (this.blockingNotFactHandles != null) {
+            for (int i = 0, length = this.blockingNotFactHandles.length; i < length; i++) {
+                if (this.blockingNotFactHandles[i] != null) {
                     this.readyForActivation = false;
+                    return;
                 }
             }
         }
+
         if (this.existsFactHandles != null) {
-            for (int i = 0, length = this.existsFactHandles.length; i < length
-                    && this.readyForActivation; i++) {
-                if (this.existsFactHandles[i].size() == 0) {
+            for (int i = 0, length = this.existsFactHandles.length; i < length; i++) {
+                if (this.existsFactHandles[i] == null) {
                     this.readyForActivation = false;
+                    return;
                 }
             }
         }
@@ -286,3 +272,6 @@
         return null;
     }
 }
+
+
+

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/leaps/Token.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/leaps/Token.java	2006-04-14 15:12:06 UTC (rev 3714)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/leaps/Token.java	2006-04-14 15:39:37 UTC (rev 3715)
@@ -36,19 +36,19 @@
  */
 class Token implements Tuple, Serializable {
 
-    private static final long serialVersionUID = 1L;
+    private static final long            serialVersionUID   = 1L;
 
-    private WorkingMemoryImpl workingMemory;
+    private WorkingMemoryImpl            workingMemory;
 
-    private final FactHandleImpl dominantFactHandle;
+    private final FactHandleImpl         dominantFactHandle;
 
-    private RuleHandle currentRuleHandle = null;
+    private RuleHandle                   currentRuleHandle  = null;
 
-    private FactHandleImpl[] currentFactHandles = new FactHandleImpl[0];
+    private FactHandleImpl[]             currentFactHandles = new FactHandleImpl[0];
 
-    boolean resume = false;
+    boolean                              resume             = false;
 
-    private Iterator rules = null;
+    private Iterator                     rules              = null;
 
     private final PropagationContextImpl propagationContext;
 
@@ -66,20 +66,19 @@
         if (this.rules == null) {
             if (this.dominantFactHandle != null) {
                 this.rules = this.workingMemory.getFactTable(
-                        this.dominantFactHandle.getObject().getClass())
-                        .getRulesIterator();
-            } else {
-                this.rules = this.workingMemory
-                        .getNoRequiredColumnsLeapsRules();
+                        this.dominantFactHandle.getObject().getClass()).getRulesIterator();
             }
+            else {
+                this.rules = this.workingMemory.getNoRequiredColumnsLeapsRules();
+            }
         }
         return this.rules;
     }
 
     public RuleHandle nextRuleHandle() {
         this.currentRuleHandle = (RuleHandle) this.rules.next();
-        this.currentFactHandles = new FactHandleImpl[this.currentRuleHandle
-                .getLeapsRule().getNumberOfColumns()];
+        this.currentFactHandles = new FactHandleImpl[this.currentRuleHandle.getLeapsRule()
+                .getNumberOfColumns()];
         return this.currentRuleHandle;
     }
 
@@ -98,20 +97,22 @@
             if (this.dominantFactHandle == null
                     || this.dominantFactHandle.getId() >= levelId) {
                 ret = this.rules.hasNext();
-            } else {
+            }
+            else {
                 // then we need to skip rules that have id lower than
                 // workingMemory.idLastFireAllAt
                 boolean done = false;
                 while (!done) {
                     if (this.rules.hasNext()) {
-                        if (((RuleHandle) ((TableIterator) this.rules)
-                                .peekNext()).getId() > levelId) {
+                        if (((RuleHandle) ((TableIterator) this.rules).peekNext()).getId() > levelId) {
                             ret = true;
                             done = true;
-                        } else {
+                        }
+                        else {
                             this.rules.next();
                         }
-                    } else {
+                    }
+                    else {
                         ret = false;
                         done = true;
                     }
@@ -124,7 +125,8 @@
     public int hashCode() {
         if (this.dominantFactHandle != null) {
             return this.dominantFactHandle.hashCode();
-        } else {
+        }
+        else {
             return 0;
         }
     }
@@ -155,20 +157,7 @@
      * @see Object
      */
     public boolean equals(Object that) {
-        if (this == that)
-            return true;
-        if (!(that instanceof Token))
-            return false;
-        if (this.dominantFactHandle != null) {
-            if (((Token) that).dominantFactHandle != null) {
-                return this.dominantFactHandle.getId() == ((Token) that).dominantFactHandle
-                        .getId();
-            } else {
-                return false;
-            }
-        } else {
-            return ((Token) that).dominantFactHandle == null;
-        }
+        return this.dominantFactHandle.getId() == ((Token) that).dominantFactHandle.getId();
     }
 
     /**
@@ -215,9 +204,8 @@
         if (this.currentFactHandles != null) {
             for (int i = 0, length = this.currentFactHandles.length; i < length; i++) {
                 ret = ret
-                        + ((i == this.currentRuleHandle.getDominantPosition()) ? "***"
-                                : "") + "\t" + i + " -> "
-                        + this.currentFactHandles[i].getObject() + "\n";
+                        + ((i == this.currentRuleHandle.getDominantPosition()) ? "***" : "")
+                        + "\t" + i + " -> " + this.currentFactHandles[i].getObject() + "\n";
             }
         }
         return ret;
@@ -266,3 +254,6 @@
         return propagationContext;
     }
 }
+
+
+

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/leaps/TokenEvaluator.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/leaps/TokenEvaluator.java	2006-04-14 15:12:06 UTC (rev 3714)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/leaps/TokenEvaluator.java	2006-04-14 15:39:37 UTC (rev 3715)
@@ -44,7 +44,7 @@
         LeapsRule leapsRule = token.getCurrentRuleHandle().getLeapsRule();
         // sometimes there is no normal conditions, only not and exists
         int numberOfColumns = leapsRule.getNumberOfColumns();
-        if (numberOfColumns > 0) {
+//        if (numberOfColumns > 0) {
             int dominantFactPosition = token.getCurrentRuleHandle().getDominantPosition();
             FactHandleImpl dominantFactHandle = token.getDominantFactHandle();
             if (leapsRule.getColumnConstraintsAtPosition(dominantFactPosition)
@@ -155,7 +155,7 @@
                             // one check negative conditions and fire consequence
                             if (jj == stopIteratingCount) {
                                 if (!skip) {
-                                    if (processAfterAllPositiveConstraintOk(token,
+                                    if (processAfterAllPositiveConstraintOk(token.getTuple(),
                                             leapsRule, workingMemory)) {
                                         return;
                                     }
@@ -171,12 +171,14 @@
                     }
                 }
             }
-        }
-        else {
-            if (processAfterAllPositiveConstraintOk(token, leapsRule, workingMemory)) {
-                return;
-            }
-        }
+//        }
+//        else {
+//            LeapsTuple tuple = token;
+//
+//            if (processAfterAllPositiveConstraintOk(token..getTuple(), leapsRule, workingMemory)) {
+//                return;
+//            }
+//        }
         // nothing was found. inform caller about it
         throw new NoMatchesFoundException();
     }
@@ -191,9 +193,8 @@
      * @return
      * @throws Exception
      */
-    final static boolean processAfterAllPositiveConstraintOk(Token token,
+    final static boolean processAfterAllPositiveConstraintOk(LeapsTuple tuple,
             LeapsRule leapsRule, WorkingMemoryImpl workingMemory) {
-        LeapsTuple tuple = token.getTuple();
         if (leapsRule.containsEvalConditions()
                 && !TokenEvaluator.evaluateEvalConditions(leapsRule, tuple, workingMemory)) {
             return false;
@@ -204,7 +205,8 @@
         if (leapsRule.containsNotColumns()) {
             TokenEvaluator.evaluateNotConditions(tuple, leapsRule, workingMemory);
         }
-        //
+        // put tuple onto fact tables that might affect activation status
+        // via exists or not conditions
         Class[] classes = leapsRule.getExistsNotColumnsClasses();
         for (int i = 0, length = classes.length; i < length; i++) {
             workingMemory.getFactTable(classes[i]).addTuple(tuple);
@@ -230,7 +232,7 @@
      * @return
      * @throws Exception
      */
-    final static boolean evaluateEvalConditions(LeapsRule leapsRule,
+    private final static boolean evaluateEvalConditions(LeapsRule leapsRule,
             LeapsTuple tuple, WorkingMemoryImpl workingMemory) {
         EvalCondition[] evals = leapsRule.getEvalConditions();
         for (int i = 0; i < evals.length; i++) {
@@ -252,25 +254,54 @@
      */
     final static void evaluateNotConditions(LeapsTuple tuple, LeapsRule rule,
             WorkingMemoryImpl workingMemory) {
-        FactHandleImpl factHandle;
-        TableIterator tableIterator;
-        ColumnConstraints constraint;
         ColumnConstraints[] not = rule.getNotColumnConstraints();
         for (int i = 0, length = not.length; i < length; i++) {
-            constraint = not[i];
-            // scan the whole table
-            tableIterator = workingMemory.getFactTable(constraint.getClassType())
+            ColumnConstraints constraint = not[i];
+            // scan table starting at start fact handle
+            TableIterator tableIterator = workingMemory.getFactTable(constraint.getClassType())
                     .iterator();
-            // fails if exists
-            while (tableIterator.hasNext()) {
-                factHandle = (FactHandleImpl) tableIterator.next();
-                // check constraint condition
+            // stops if exists
+            boolean done = false;
+            while (!done && tableIterator.hasNext()) {
+                FactHandleImpl factHandle = (FactHandleImpl) tableIterator.next();
+                // check constraint conditions
                 if (constraint.isAllowed(factHandle, tuple, workingMemory)) {
-                    tuple.addNotFactHandle(factHandle, i);
+                    tuple.setBlockingNotFactHandle(factHandle, i);
                     factHandle.addNotTuple(tuple, i);
+                    done = true;
                 }
             }
         }
+     }
+
+    /**
+     * To evaluate conditions above the water line that is supplied in the first argument
+     * 
+     * @param startFactHandle
+     * @param index
+     * @param tuple
+     * @param rule
+     * @param workingMemory
+     */
+    final static void evaluateNotCondition(FactHandleImpl startFactHandle, int index,
+            LeapsTuple tuple, WorkingMemoryImpl workingMemory) {
+        LeapsRule rule = tuple.getLeapsRule();
+        // scan table starting at start fact handle
+        ColumnConstraints constraint = rule.getNotColumnConstraints()[index];
+        TableIterator tableIterator = workingMemory.getFactTable(constraint.getClassType())
+                .headIterator(startFactHandle);
+        // stops if exists
+        boolean done = false;
+        while (!done && tableIterator.hasNext()) {
+            FactHandleImpl factHandle = (FactHandleImpl) tableIterator.next();
+            // check constraint conditions
+            if (constraint.isAllowed(factHandle, tuple, workingMemory)) {
+                tuple.setBlockingNotFactHandle(factHandle, index);
+                factHandle.addNotTuple(tuple, index);
+                done = true;
+            }
+        }
+
     }
 
     /**
@@ -280,26 +311,58 @@
      * @param memory
      * @throws Exception
      */
-    final static void evaluateExistsConditions(LeapsTuple tuple, LeapsRule rule,
+    private final static void evaluateExistsConditions(LeapsTuple tuple, LeapsRule rule,
             WorkingMemoryImpl workingMemory) {
-        FactHandleImpl factHandle;
-        TableIterator tableIterator;
-        ColumnConstraints constraint;
         ColumnConstraints[] exists = rule.getExistsColumnConstraints();
         for (int i = 0, length = exists.length; i < length; i++) {
-            constraint = exists[i];
-            // scan the whole table
-            tableIterator = workingMemory.getFactTable(constraint.getClassType())
+            ColumnConstraints constraint = exists[i];
+            // scan table starting at start fact handle
+            TableIterator tableIterator = workingMemory.getFactTable(constraint.getClassType())
                     .iterator();
-            // fails if exists
-            while (tableIterator.hasNext()) {
-                factHandle = (FactHandleImpl) tableIterator.next();
+            // stop if exists
+            boolean done = false;
+            while (!done && tableIterator.hasNext()) {
+                FactHandleImpl factHandle = (FactHandleImpl) tableIterator.next();
                 // check constraint conditions
                 if (constraint.isAllowed(factHandle, tuple, workingMemory)) {
-                    tuple.addExistsFactHandle(factHandle, i);
+                    tuple.setExistsFactHandle(factHandle, i);
                     factHandle.addExistsTuple(tuple, i);
+                    done = true;
                 }
             }
         }
     }
+
+    /**
+     * To evaluate conditions above the water line that is supplied in the first
+     * argument
+     * 
+     * @param startFactHandle
+     * @param index
+     * @param tuple
+     * @param rule
+     * @param workingMemory
+     */
+    final static void evaluateExistsCondition(FactHandleImpl startFactHandle, int index,
+            LeapsTuple tuple, WorkingMemoryImpl workingMemory) {
+        LeapsRule rule = tuple.getLeapsRule();
+        // scan table starting at start fact handle
+        ColumnConstraints constraint = rule.getExistsColumnConstraints()[index];
+        TableIterator tableIterator = workingMemory.getFactTable(constraint.getClassType())
+                .headIterator(startFactHandle);
+        // stop if exists
+        boolean done = false;
+        while (!done && tableIterator.hasNext()) {
+            FactHandleImpl factHandle = (FactHandleImpl) tableIterator.next();
+            // check constraint conditions
+            if (constraint.isAllowed(factHandle, tuple, workingMemory)) {
+                tuple.setExistsFactHandle(factHandle, index);
+                factHandle.addExistsTuple(tuple, index);
+                done = true;
+            }
+        }
+    }
 }
+
+
+

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/leaps/WorkingMemoryImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/leaps/WorkingMemoryImpl.java	2006-04-14 15:12:06 UTC (rev 3714)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/leaps/WorkingMemoryImpl.java	2006-04-14 15:39:37 UTC (rev 3715)
@@ -88,12 +88,6 @@
         this.agenda.setFocus(AgendaGroup.MAIN);
         //
         this.queryResults = new HashMap();
-        // to pick up rules that do not require columns, only not and exists
-        PropagationContextImpl context = new PropagationContextImpl(
-                nextPropagationIdCounter(), PropagationContext.ASSERTION, null,
-                null);
-
-        this.pushTokenOnStack(new Token(this, null, context));
     }
 
     /**
@@ -261,18 +255,8 @@
             handle.addLogicalDependency(tuple);
         }
 
-        // leaps handle already has object attached
-        // handle.setObject( object );
-
-        // this.ruleBase.assertObject( handle,
-        // object,
-        // propagationContext,
-        // this );
-
         // determine what classes it belongs to put it into the "table" on
         // class name key
-        LeapsTuple tuple;
-        LeapsRule leapsRule;
         Class objectClass = object.getClass();
         for (Iterator tables = this.getFactTablesList(objectClass).iterator(); tables
                 .hasNext();) {
@@ -280,45 +264,45 @@
             // adding fact to container
             factTable.add(handle);
             // inspect all tuples for exists and not conditions and activate /
-            // deactivate
-            // agenda items
-            ColumnConstraints constraint;
-            ColumnConstraints[] constraints;
+            // deactivate agenda items
             for (Iterator tuples = factTable.getTuplesIterator(); tuples
                     .hasNext();) {
-                tuple = (LeapsTuple) tuples.next();
-                leapsRule = tuple.getLeapsRule();
-                // check not constraints
-                constraints = leapsRule.getNotColumnConstraints();
-                for (int i = 0, length = constraints.length; i < length; i++) {
-                    constraint = constraints[i];
-                    if (objectClass.isAssignableFrom(constraint.getClassType())
-                            && constraint.isAllowed(handle, tuple, this)) {
-                        tuple.addNotFactHandle(handle, i);
-                        handle.addNotTuple(tuple, i);
+                LeapsTuple tuple = (LeapsTuple) tuples.next();
+                if (!tuple.isActivationNull()) {
+                    // check not constraints only on activated tuples to see if
+                    // we need to deactivate
+                    ColumnConstraints[] not = tuple.getLeapsRule().getNotColumnConstraints();
+                    for (int i = 0, length = not.length; i < length; i++) {
+                        ColumnConstraints constraint = not[i];
+                        if (constraint.isAllowed(handle, tuple, this)) {
+                            tuple.setBlockingNotFactHandle(handle, i);
+                            handle.addNotTuple(tuple, i);
+                        }
                     }
+                    // check and see if we need de-activate
+                    if (!tuple.isReadyForActivation()) {
+                        // time to pull from agenda
+                        this.invalidateActivation(tuple);
+                    }
                 }
-                // check exists constraints
-                constraints = leapsRule.getExistsColumnConstraints();
-                for (int i = 0, length = constraints.length; i < length; i++) {
-                    constraint = constraints[i];
-                    if (objectClass.isAssignableFrom(constraint.getClassType())
-                            && constraint.isAllowed(handle, tuple, this)) {
-                        tuple.addExistsFactHandle(handle, i);
-                        handle.addExistsTuple(tuple, i);
+                else {
+                    // check exists constraints and activate constraints
+                    ColumnConstraints[] exists = tuple.getLeapsRule().getExistsColumnConstraints();
+                    for (int i = 0, length = exists.length; i < length; i++) {
+                        ColumnConstraints constraint = exists[i];
+                        if (constraint.getClassType().isAssignableFrom(objectClass)) {
+                            if (constraint.isAllowed(handle, tuple, this)) {
+                                tuple.setExistsFactHandle(handle, i);
+                                handle.addExistsTuple(tuple, i);
+                            }
+                        }
                     }
+                    // check and see if we need activate
+                    if (tuple.isReadyForActivation()) {
+                        // ready to activate
+                        this.assertTuple(tuple);
+                    } 
                 }
-                // check and see if we need deactivate / activate
-                if (tuple.isReadyForActivation() && tuple.isActivationNull()) {
-                    // ready to activate
-                    this.assertTuple(tuple);
-                    // remove tuple from fact table
-                    tuples.remove();
-                } else if (!tuple.isReadyForActivation()
-                        && !tuple.isActivationNull()) {
-                    // time to pull from agenda
-                    this.invalidateActivation(tuple);
-                }
             }
         }
 
@@ -385,32 +369,37 @@
 
         // 1. remove fact for nots and exists tuples
         FactHandleTupleAssembly assembly;
+        LeapsTuple tuple;
         Iterator it;
-        it = ((FactHandleImpl) handle).getNotTuples();
+        it = ((FactHandleImpl) handle).getNotTupleAssemblies();
         if (it != null) {
             for (; it.hasNext();) {
                 assembly = (FactHandleTupleAssembly) it.next();
-                assembly.getTuple().removeNotFactHandle(handle,
-                        assembly.getIndex());
+                tuple = assembly.getTuple();
+                tuple.removeBlockingNotFactHandle(assembly.getIndex());
+                TokenEvaluator.evaluateNotCondition(new FactHandleImpl(
+                        ((FactHandleImpl) handle).getId() + 1, null), assembly.getIndex(), tuple, this);
             }
         }
-        it = ((FactHandleImpl) handle).getExistsTuples();
+        it = ((FactHandleImpl) handle).getExistsTupleAssemblies();
         if (it != null) {
             for (; it.hasNext();) {
                 assembly = (FactHandleTupleAssembly) it.next();
-                assembly.getTuple().removeExistsFactHandle(handle,
-                        assembly.getIndex());
+                tuple = assembly.getTuple();
+                tuple.removeExistsFactHandle(assembly.getIndex());
+                TokenEvaluator.evaluateExistsCondition(new FactHandleImpl(
+                        ((FactHandleImpl) handle).getId() + 1, null), assembly.getIndex(),
+                        tuple, this);
             }
         }
         // 2. assert all tuples that are ready for activation or cancel ones
         // that are no longer
-        LeapsTuple tuple;
         IteratorChain chain = new IteratorChain();
-        it = ((FactHandleImpl) handle).getNotTuples();
+        it = ((FactHandleImpl) handle).getNotTupleAssemblies();
         if (it != null) {
             chain.addIterator(it);
         }
-        it = ((FactHandleImpl) handle).getExistsTuples();
+        it = ((FactHandleImpl) handle).getExistsTupleAssemblies();
         if (it != null) {
             chain.addIterator(it);
         }
@@ -443,15 +432,12 @@
         }
 
         // not applicable to leaps implementation
-        // this.factHandlePool.push( ((FactHandleImpl) handle).getId() );
         PropagationContextImpl context = new PropagationContextImpl(
                 nextPropagationIdCounter(), PropagationContext.RETRACTION,
                 rule, activation);
 
         this.workingMemoryEventSupport.fireObjectRetracted(context, handle,
                 oldObject);
-        // not applicable to leaps fact handle
-        // ((FactHandleImpl) handle).invalidate();
     }
 
     private void invalidateActivation(LeapsTuple tuple) {
@@ -576,7 +562,6 @@
                         }
                     }
                 }
-                
             }
         }
 
@@ -611,12 +596,16 @@
                         ruleHandlesList.add(ruleHandle);
                     }
                     this.leapsRulesToHandlesMap.put(rule, ruleHandlesList);
-                } else {
-                    ruleHandle = new RuleHandle(
-                            ((HandleFactory) this.handleFactory).getNextId(),
-                            rule, -1);
-                    this.noRequiredColumnsLeapsRules.add(ruleHandle);
-                    this.leapsRulesToHandlesMap.put(rule, ruleHandle);
+                } 
+                else {
+                    // to pick up rules that do not require columns, only not
+                    // and exists
+                    PropagationContextImpl context = new PropagationContextImpl(
+                            nextPropagationIdCounter(), PropagationContext.ASSERTION, null,
+                            null);
+
+                    TokenEvaluator.processAfterAllPositiveConstraintOk(
+                            new LeapsTuple(new FactHandleImpl[0], rule, context), rule, this);
                 }
             }
         }
@@ -705,8 +694,7 @@
                         }
                     }
                 }
-                // pick activations generated by retraction
-                // retraction does not put tokens on stack but
+                // pick activations generated by retraction or assert
                 // can generate activations off exists and not pending tuples
                 while (this.agenda.fireNextItem(agendaFilter)) {
                     ;
@@ -882,3 +870,6 @@
     }
 
 }
+
+
+

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/leaps/util/TableIterator.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/leaps/util/TableIterator.java	2006-04-14 15:12:06 UTC (rev 3714)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/leaps/util/TableIterator.java	2006-04-14 15:39:37 UTC (rev 3715)
@@ -26,20 +26,20 @@
  * 
  */
 public interface TableIterator extends Iterator {
-	/**
-	 * single object iterator
-	 * 
-	 * @return table iterator
-	 */
-	public boolean isEmpty();
+    /**
+     * single object iterator
+     * 
+     * @return table iterator
+     */
+    public boolean isEmpty();
 
-	public void reset();
+    public void reset();
 
-	public boolean hasNext();
+    public boolean hasNext();
 
-	public Object next();
+    public Object next();
 
-	public Object peekNext();
+    public Object peekNext();
 
-	public void remove();
+    public void remove();
 }

Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/leaps/util/TableIteratorTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/leaps/util/TableIteratorTest.java	2006-04-14 15:12:06 UTC (rev 3714)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/leaps/util/TableIteratorTest.java	2006-04-14 15:39:37 UTC (rev 3715)
@@ -314,3 +314,5 @@
 
 }
 
+
+

[Jboss-svn-commits] JBL Code SVN: r3714 - labs/jbossweb/trunk

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

Author: rem...@jb...
Date: 2006-04-14 11:12:06 -0400 (Fri, 14 Apr 2006)
New Revision: 3714

Modified:
   labs/jbossweb/trunk/build.properties.default
   labs/jbossweb/trunk/build.xml
Log:
- Restore webconsole (which works again).
- Update to JBoss 4.0.4 CR 2.

Modified: labs/jbossweb/trunk/build.properties.default
===================================================================
--- labs/jbossweb/trunk/build.properties.default	2006-04-14 15:06:55 UTC (rev 3713)
+++ labs/jbossweb/trunk/build.properties.default	2006-04-14 15:12:06 UTC (rev 3714)
@@ -19,7 +19,7 @@
 jboss.version.major=4
 jboss.version.minor=0
 jboss.version.build=4
-jboss.version.patch=RC1
+jboss.version.patch=CR2
 
 # ----- Compile Control Flags -----
 compile.debug=on

Modified: labs/jbossweb/trunk/build.xml
===================================================================
--- labs/jbossweb/trunk/build.xml	2006-04-14 15:06:55 UTC (rev 3713)
+++ labs/jbossweb/trunk/build.xml	2006-04-14 15:12:06 UTC (rev 3714)
@@ -16,18 +16,18 @@
   <property name="version.major"         value="4" />
   <property name="version.minor"         value="0" />
   <property name="version.build"         value="0" />
-  <property name="version.patch"         value="" />
+  <property name="version.patch"         value="DR" />
   <property name="version.flag"          value="" />
-  <property name="version.number"        value="${version.major}.${version.minor}.${version.build}${version.patch}" />
-  <property name="version"               value="${version.major}.${version.minor}.${version.build}${version.patch}${version.flag}" />
+  <property name="version.number"        value="${version.major}.${version.minor}.${version.build}.${version.patch}" />
+  <property name="version"               value="${version.major}.${version.minor}.${version.build}.${version.patch}${version.flag}" />
 
   <property name="jboss.version.major"         value="4" />
   <property name="jboss.version.minor"         value="0" />
   <property name="jboss.version.build"         value="0" />
-  <property name="jboss.version.patch"         value="" />
+  <property name="jboss.version.patch"         value="DR" />
   <property name="jboss.version.flag"          value="" />
-  <property name="jboss.version.number"        value="${jboss.version.major}.${jboss.version.minor}.${jboss.version.build}${jboss.version.patch}" />
-  <property name="jboss.version"               value="${jboss.version.major}.${jboss.version.minor}.${jboss.version.build}${jboss.version.patch}${jboss.version.flag}" />
+  <property name="jboss.version.number"        value="${jboss.version.major}.${jboss.version.minor}.${jboss.version.build}.${jboss.version.patch}" />
+  <property name="jboss.version"               value="${jboss.version.major}.${jboss.version.minor}.${jboss.version.build}.${jboss.version.patch}${jboss.version.flag}" />
 
   <property name="project"               value="jbossweb" />
   <property name="final.name"            value="${project}-${version}" />
@@ -94,9 +94,11 @@
 
         <include name="conf/**" />
 
+        <include name="lib/bsh-1.3.0.jar" />
         <include name="lib/commons-logging.jar" />
         <include name="lib/hsqldb.jar" />
         <include name="lib/hsqldb-plugin.jar" />
+        <include name="lib/javassist.jar" />
         <include name="lib/javax.servlet.jar" />
         <include name="lib/javax.servlet.jsp.jar" />
         <include name="lib/jboss.jar" />
@@ -121,7 +123,8 @@
 
         <include name="deploy/jboss-aop.deployer/**" />
         <include name="deploy/jmx-console.war/**" />
-        <!--<include name="deploy/management/**" />-->
+        <include name="deploy/tc5-cluster.sar/**" />
+        <include name="deploy/management/**" />
         <include name="deploy/cache-invalidation-service.xml" />
         <include name="deploy/hsqldb-ds.xml" />
         <include name="deploy/jboss-ha-local-jdbc.rar" />

[Jboss-svn-commits] JBL Code SVN: r3712 - labs/portletswap/imagegalleryportlet

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

Author: dam...@jb...
Date: 2006-04-14 11:04:27 -0400 (Fri, 14 Apr 2006)
New Revision: 3712

Added:
   labs/portletswap/imagegalleryportlet/trunk/
Log:
Adding portletswap.

[Jboss-svn-commits] JBL Code SVN: r3711 - labs/portletswap/imagegalleryportlet

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

Author: dam...@jb...
Date: 2006-04-14 11:04:22 -0400 (Fri, 14 Apr 2006)
New Revision: 3711

Added:
   labs/portletswap/imagegalleryportlet/tags/
Log:
Adding portletswap.

[Jboss-svn-commits] JBL Code SVN: r3710 - labs/portletswap/imagegalleryportlet

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

Author: dam...@jb...
Date: 2006-04-14 11:04:17 -0400 (Fri, 14 Apr 2006)
New Revision: 3710

Added:
   labs/portletswap/imagegalleryportlet/branches/
Log:
Adding portletswap.

[Jboss-svn-commits] JBL Code SVN: r3709 - labs/portletswap

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

Author: dam...@jb...
Date: 2006-04-14 11:04:10 -0400 (Fri, 14 Apr 2006)
New Revision: 3709

Added:
   labs/portletswap/imagegalleryportlet/
Log:
Adding portletswap.

[Jboss-svn-commits] JBL Code SVN: r3708 - labs

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

Author: dam...@jb...
Date: 2006-04-14 11:03:41 -0400 (Fri, 14 Apr 2006)
New Revision: 3708

Added:
   labs/portletswap/
Log:
Adding portletswap.

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

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

Author: mic...@jb...
Date: 2006-04-14 06:37:05 -0400 (Fri, 14 Apr 2006)
New Revision: 3707

Modified:
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java
Log:
JBRULES-212

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java	2006-04-14 09:51:18 UTC (rev 3706)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java	2006-04-14 10:37:05 UTC (rev 3707)
@@ -217,6 +217,8 @@
         in.close();
         return obj;
     }
+    
+    
 
     private byte[] serializeOut(Object obj) throws IOException {
         // Serialize to a byte array
@@ -229,6 +231,25 @@
         byte[] bytes = bos.toByteArray();
         return bytes;
     }
+    
+    public void testNoPackageName() {
+        PackageBuilder builder = new PackageBuilder();
+        try {
+            builder.addPackage( new PackageDescr(null) );
+            fail("should have errored here.");
+        } catch (RuntimeException e) {
+            assertNotNull(e.getMessage());
+        }
+        try {
+            builder.addPackage( new PackageDescr("") );
+            fail("should have errored here.");
+        } catch (RuntimeException e) {
+            assertNotNull(e.getMessage());
+        }
+        
+        
+        
+    }
 
     public void testLiteral() throws Exception {
         PackageBuilder builder = new PackageBuilder();

[Jboss-svn-commits] JBL Code SVN: r3706 - labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler

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

Author: mic...@jb...
Date: 2006-04-14 05:51:18 -0400 (Fri, 14 Apr 2006)
New Revision: 3706

Modified:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java
Log:
JBRULES-212

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java	2006-04-14 09:13:45 UTC (rev 3705)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java	2006-04-14 09:51:18 UTC (rev 3706)
@@ -100,6 +100,11 @@
     
     public void addPackage(PackageDescr packageDescr) {
 
+        if (packageDescr.getName() == null || "".equals(packageDescr.getName())) {
+            
+            throw new MissingPackageNameException("Missing package name for rule package.");
+        }
+        
         if ( this.pkg != null ) {
             //mergePackage( packageDescr ) ;
             mergePackage( this.pkg,
@@ -336,6 +341,12 @@
         return name.toUpperCase().charAt( 0 ) + name.substring( 1 );
     }
 
+    public static class MissingPackageNameException extends IllegalArgumentException {
 
+        public MissingPackageNameException(String message) {
+            super(message);
+        }
+        
+    }
 
 }

[Jboss-svn-commits] JBL Code SVN: r3705 - in labs/jbosslabs/trunk/portal-extensions: binaries/maven-repo-addons/jboss/jars forge-common/src/java/org/jboss/forge/common/navigation forge-portal-attr/src/java/org/jboss/forge/portal

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

Author: adamw
Date: 2006-04-14 05:13:45 -0400 (Fri, 14 Apr 2006)
New Revision: 3705

Modified:
   labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/jboss/jars/status-common.jar
   labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/navigation/Entry.java
   labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/AttributesFilter.java
Log:
Small fixes


Modified: labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/jboss/jars/status-common.jar
===================================================================
(Binary files differ)

Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/navigation/Entry.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/navigation/Entry.java	2006-04-14 04:31:14 UTC (rev 3704)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/navigation/Entry.java	2006-04-14 09:13:45 UTC (rev 3705)
@@ -196,7 +196,8 @@
 
         // To each link, adding a noproject param, unless it's a project link.
         if ((!link.contains(NO_PROJECT_PARAM)) &&
-                (!ForgeHelper.isOutsideLink(link))) {
+                (!ForgeHelper.isOutsideLink(link)) &&
+                (getProject() == null)) {
             // Checking if this is a first parameter.
             if (link.contains("?"))
                 return link + "&" + NO_PROJECT_PARAM;

Modified: labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/AttributesFilter.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/AttributesFilter.java	2006-04-14 04:31:14 UTC (rev 3704)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/AttributesFilter.java	2006-04-14 09:13:45 UTC (rev 3705)
@@ -66,6 +66,12 @@
             } else if ((project != null) && (!"".equals(project))) {
                 httpRequest.getSession().setAttribute(Constants.ATTR_PROJECT, project);
                 httpRequest.setAttribute(Constants.ATTR_PROJECT, project);
+            } else {
+                Object projectObj = httpRequest.getSession().getAttribute(
+                        ProjectsHelper.PROJECT_URL_PARAM);
+                if (projectObj != null) {
+                    httpRequest.setAttribute(Constants.ATTR_PROJECT, projectObj.toString());
+                }
             }
 
             // Putting the full requested url into session for navigation.

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

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

Author: mic...@jb...
Date: 2006-04-14 00:31:14 -0400 (Fri, 14 Apr 2006)
New Revision: 3704

Modified:
   labs/jbossrules/trunk/documentation/manual/en/Chapter-Rule_Language/Section-Overview.xml
Log:
added some keywords

Modified: labs/jbossrules/trunk/documentation/manual/en/Chapter-Rule_Language/Section-Overview.xml
===================================================================
--- labs/jbossrules/trunk/documentation/manual/en/Chapter-Rule_Language/Section-Overview.xml	2006-04-14 04:27:42 UTC (rev 3703)
+++ labs/jbossrules/trunk/documentation/manual/en/Chapter-Rule_Language/Section-Overview.xml	2006-04-14 04:31:14 UTC (rev 3704)
@@ -89,6 +89,8 @@
 end
 contains
 matches
+and
+or
 modify
 retract
 assert

[Jboss-svn-commits] JBL Code SVN: r3701 - in labs/shotoku/trunk: shotoku-base/src/java/org/jboss/shotoku/service shotoku-svn/src/java/org/jboss/shotoku/svn/service

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

Author: dam...@jb...
Date: 2006-04-13 21:23:48 -0400 (Thu, 13 Apr 2006)
New Revision: 3701

Modified:
   labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/service/ShotokuServiceImpl.java
   labs/shotoku/trunk/shotoku-svn/src/java/org/jboss/shotoku/svn/service/SvnRepository.java
   labs/shotoku/trunk/shotoku-svn/src/java/org/jboss/shotoku/svn/service/SvnServiceImpl.java
Log:
http://jira.jboss.com/jira/browse/JBSHOTOKU-81.  Added some general state info log messages to track services starting.  Still need to add info messages to the jcr and file based services.

Modified: labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/service/ShotokuServiceImpl.java
===================================================================
--- labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/service/ShotokuServiceImpl.java	2006-04-13 22:11:36 UTC (rev 3700)
+++ labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/service/ShotokuServiceImpl.java	2006-04-14 01:23:48 UTC (rev 3701)
@@ -56,13 +56,17 @@
     }
 
     public void start() throws Exception {
+		  log.info("ShotokuService starting.  Setting up content manager...");
         /*
          * Setting up content managers.
          */
         ContentManager.setup();
+        log.info("ContentManager setup completed.  Getting the default service timer interval...");
 
         // Setting the default timer interval.
         timerInterval = ContentManager.getDefaultServiceInterval();
+		  log.info("Timer interval is: "+timerInterval+".  Starting update thread...");
+		  
 
         new Thread() {
             {
@@ -86,6 +90,7 @@
                 }
             }
         }.start();
+		  log.info("Shotoku Service started.");
     }
 
     public void stop() {

Modified: labs/shotoku/trunk/shotoku-svn/src/java/org/jboss/shotoku/svn/service/SvnRepository.java
===================================================================
--- labs/shotoku/trunk/shotoku-svn/src/java/org/jboss/shotoku/svn/service/SvnRepository.java	2006-04-13 22:11:36 UTC (rev 3700)
+++ labs/shotoku/trunk/shotoku-svn/src/java/org/jboss/shotoku/svn/service/SvnRepository.java	2006-04-14 01:23:48 UTC (rev 3701)
@@ -76,16 +76,24 @@
 
     public SvnRepository(String id, String username, String password,
                          String url, String localpath) {
+        log.info("Creating new Subversion Repository:  id: "+id+
+		           ", username: "+username+
+					  ", passwd: "+password+
+					  ", url: "+url+
+					  ", localpath: "+localpath);
         ISVNOptions options = SVNWCUtil.createDefaultOptions(true);
+		  log.info("  Creating new SVNClientManager...");
         ourClientManager =
                 SVNClientManager.newInstance(options, username, password);
-
+        log.info("    SVNClientManager created.");
         try {
             repository = SVNRepositoryFactory.create(SVNURL.parseURIEncoded(
                     url));
+				log.info("  SVNRepositoryFactory.create() call successful.  Setting AuthenticationManager...");
             repository.setAuthenticationManager(
                     SVNWCUtil.createDefaultAuthenticationManager(username,
                             password));
+            log.info("  AuthenticationManager set using given username and passwd.");
         } catch (SVNException e) {
             log.warn("Error while creating SVNRepository.", e);
         }
@@ -108,6 +116,8 @@
         frozenDeletedResources = new ConcurrentHashSet<String>();
 
         delayedOperations = new ConcurrentHashSet<DelayedOperation>();
+
+		  log.info("SVNRepository created.");
     }
 
     /**
@@ -127,7 +137,9 @@
      * update fails.
      */
     public void firstUpdate() {
+	 	  log.info("Updating the working copy for the first time...");
         update(true, true);
+		  log.info("First update complete.");
     }
 
     /**

Modified: labs/shotoku/trunk/shotoku-svn/src/java/org/jboss/shotoku/svn/service/SvnServiceImpl.java
===================================================================
--- labs/shotoku/trunk/shotoku-svn/src/java/org/jboss/shotoku/svn/service/SvnServiceImpl.java	2006-04-13 22:11:36 UTC (rev 3700)
+++ labs/shotoku/trunk/shotoku-svn/src/java/org/jboss/shotoku/svn/service/SvnServiceImpl.java	2006-04-14 01:23:48 UTC (rev 3701)
@@ -54,23 +54,32 @@
 	private volatile long timerInterval;
 	
 	private ConcurrentMap<String, SvnRepository> repositories;
+
+	private boolean svnServiceRunnable = true;
 	
 	/*
 	 * Service lifecycle management.
 	 */
 	
 	public void create() throws Exception {
+	    log.info("Creating Subversion Service.  Setting up DAVRepositoryFactory...");
+
 		// Set up connection protocols support:
         // for DAV (over http and https)
         DAVRepositoryFactory.setup();
+		  log.info("DAVRepositoryFactory setup.  Setting up SVNRepositoryFactory...");
 
         // for SVN (over svn and svn+ssh)
         SVNRepositoryFactoryImpl.setup();
+		  log.info("SVNRepositoryFactory setup complete.");
 		
 		repositories = new ConcurrentHashMap<String, SvnRepository>();
+		  log.info("Created.");
 	}
 	
 	public void start() throws Exception {
+		log.info("Starting Subversion Service...");
+		setSvnServiceRunnable(true);
 		// Setting the default timer interval.
 		timerInterval = SvnTools.DEFAULT_TIMER_INTERVAL;
 
@@ -81,7 +90,7 @@
 			}
 			
 			public void run() {
-				while (true) {
+				while (getSvnServiceRunnable()) {
 					try {
 						sleep(getTimerInterval());
 					} catch (InterruptedException e) {
@@ -94,15 +103,31 @@
                         // Making sure that an exception won't stop the thread.
                     }
                 }
+					 log.info("Subversion Service Deaemon Thread terminated.");
 			}
 		}.start();
+		log.info("Subversion Service started with update interval: "+timerInterval);
     }
 
 	public void stop() {
+		log.info("Stopping Subversion Service...");	
+		setSvnServiceRunnable(false);
+		log.info("Subversion Service signaled to stop.");	
 	}
 
 	public void destroy() {
 	}
+
+	/*
+	 * Service start and stop flags.
+	 */
+	public void setSvnServiceRunnable(boolean b) {
+		svnServiceRunnable = b;
+	}
+
+	public boolean getSvnServiceRunnable() {
+		return svnServiceRunnable;
+	}
 	
 	/*
 	 * Timer-handling functions.

[Jboss-svn-commits] JBL Code SVN: r3700 - in labs/jbossrules/trunk/drools-ide: . src/main/java/org/drools/ide src/main/java/org/drools/ide/builder src/main/java/org/drools/ide/preferences

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

Author: KrisVerlaenen
Date: 2006-04-13 18:11:36 -0400 (Thu, 13 Apr 2006)
New Revision: 3700

Added:
   labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/preferences/DroolsPreferencePage.java
   labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/preferences/IDroolsConstants.java
Modified:
   labs/jbossrules/trunk/drools-ide/plugin.xml
   labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/DroolsIDEPlugin.java
   labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/builder/DroolsBuilder.java
Log:
added preference page

Modified: labs/jbossrules/trunk/drools-ide/plugin.xml
===================================================================
--- labs/jbossrules/trunk/drools-ide/plugin.xml	2006-04-13 22:11:32 UTC (rev 3699)
+++ labs/jbossrules/trunk/drools-ide/plugin.xml	2006-04-13 22:11:36 UTC (rev 3700)
@@ -150,4 +150,11 @@
        <toc file="help/debug/debug.toc" />
    </extension>
    
+   <extension point = "org.eclipse.ui.preferencePages">
+       <page id="org.drools.ide.preferences.DroolsPreferencePage"
+	    	 class="org.drools.ide.preferences.DroolsPreferencePage"
+             name="JBoss Rules Preferences">
+       </page>
+   </extension>
+   
 </plugin>

Modified: labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/DroolsIDEPlugin.java
===================================================================
--- labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/DroolsIDEPlugin.java	2006-04-13 22:11:32 UTC (rev 3699)
+++ labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/DroolsIDEPlugin.java	2006-04-13 22:11:36 UTC (rev 3700)
@@ -6,9 +6,11 @@
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 
+import org.drools.ide.preferences.IDroolsConstants;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.debug.core.DebugException;
+import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.resource.ImageRegistry;
 import org.eclipse.swt.graphics.Color;
@@ -143,4 +145,9 @@
 	public void setColor(String type, Color color) {
 		colors.put(type, color);
 	}
+	
+	protected void initializeDefaultPreferences(IPreferenceStore store) {
+		store.setDefault(IDroolsConstants.BUILD_ALL, false);
+	}
+
 }

Modified: labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/builder/DroolsBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/builder/DroolsBuilder.java	2006-04-13 22:11:32 UTC (rev 3699)
+++ labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/builder/DroolsBuilder.java	2006-04-13 22:11:36 UTC (rev 3700)
@@ -17,6 +17,7 @@
 import org.drools.compiler.RuleError;
 import org.drools.ide.DroolsIDEPlugin;
 import org.drools.ide.editors.DSLAdapter;
+import org.drools.ide.preferences.IDroolsConstants;
 import org.drools.ide.util.ProjectClassLoader;
 import org.drools.lang.descr.PackageDescr;
 import org.eclipse.core.resources.IFile;
@@ -82,9 +83,13 @@
     
     protected void incrementalBuild(IResourceDelta delta,
             IProgressMonitor monitor) throws CoreException {
-        delta.accept(new DroolsBuildDeltaVisitor());
-    	// to make sure that all rules are checked when a java file is changed 
-    	// fullBuild(monitor);
+    	boolean buildAll = DroolsIDEPlugin.getDefault().getPreferenceStore().getBoolean(IDroolsConstants.BUILD_ALL);
+        if (buildAll) {
+        	// to make sure that all rules are checked when a java file is changed 
+        	fullBuild(monitor);
+        } else {
+        	delta.accept(new DroolsBuildDeltaVisitor());
+        }
     }
 
     private class DroolsBuildVisitor implements IResourceVisitor {

Added: labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/preferences/DroolsPreferencePage.java
===================================================================
--- labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/preferences/DroolsPreferencePage.java	2006-04-13 22:11:32 UTC (rev 3699)
+++ labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/preferences/DroolsPreferencePage.java	2006-04-13 22:11:36 UTC (rev 3700)
@@ -0,0 +1,70 @@
+package org.drools.ide.preferences;
+
+import org.drools.ide.DroolsIDEPlugin;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.preference.PreferencePage;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPreferencePage;
+
+public class DroolsPreferencePage extends PreferencePage implements IWorkbenchPreferencePage {
+
+	private Button buildAllCheckBox;
+	
+	protected Control createContents(Composite parent) {
+		buildAllCheckBox = createCheckBox(parent,
+			"Automatically reparse all rules if a Java resource is changed.");
+
+		initializeValues();
+
+		return new Composite(parent, SWT.NULL);
+	}
+
+	private Button createCheckBox(Composite group, String label) {
+        Button button = new Button(group, SWT.CHECK | SWT.LEFT);
+        button.setText(label);
+        GridData data = new GridData();
+        button.setLayoutData(data);
+        return button;
+    }
+	
+	protected IPreferenceStore doGetPreferenceStore() {
+        return DroolsIDEPlugin.getDefault().getPreferenceStore();
+    }
+	
+	private void initializeDefaults() {
+        IPreferenceStore store = getPreferenceStore();
+        buildAllCheckBox.setSelection(store.getDefaultBoolean(IDroolsConstants.BUILD_ALL));
+    }
+
+	private void initializeValues() {
+        IPreferenceStore store = getPreferenceStore();
+        buildAllCheckBox.setSelection(store.getBoolean(IDroolsConstants.BUILD_ALL));
+    }
+
+	protected void performDefaults() {
+        super.performDefaults();
+        initializeDefaults();
+    }
+
+	public boolean performOk() {
+        storeValues();
+        DroolsIDEPlugin.getDefault().savePluginPreferences();
+        return true;
+    }
+	
+	private void storeValues() {
+        IPreferenceStore store = getPreferenceStore();
+        store.setValue(IDroolsConstants.BUILD_ALL, buildAllCheckBox.getSelection());
+    }
+
+	public void init(IWorkbench workbench) {
+		// do nothing
+	}
+
+
+}

Added: labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/preferences/IDroolsConstants.java
===================================================================
--- labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/preferences/IDroolsConstants.java	2006-04-13 22:11:32 UTC (rev 3699)
+++ labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/preferences/IDroolsConstants.java	2006-04-13 22:11:36 UTC (rev 3700)
@@ -0,0 +1,7 @@
+package org.drools.ide.preferences;
+
+public interface IDroolsConstants {
+
+	String BUILD_ALL = "Drools.BuildAll";
+	
+}

[Jboss-svn-commits] JBL Code SVN: r3699 - labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide

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

Author: KrisVerlaenen
Date: 2006-04-13 18:11:32 -0400 (Thu, 13 Apr 2006)
New Revision: 3699

Added:
   labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/preferences/
Log:
added preference page

[Jboss-svn-commits] JBL Code SVN: r3698 - in labs/jbosslabs/branches/qa/jbosslabs/portal-extensions: forge-common/src/java/org/jboss/forge/common/navigation forge-common/src/java/org/jboss/forge/common/projects forge-navigation/src/java/org/jboss/forge/navigation forge-sar

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

Author: dam...@jb...
Date: 2006-04-13 17:14:55 -0400 (Thu, 13 Apr 2006)
New Revision: 3698

Added:
   labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/navigation/WikiLinkEntry.java
Modified:
   labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/navigation/EntryFactory.java
   labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsHelper.java
   labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-navigation/src/java/org/jboss/forge/navigation/NavigationConfWatcher.java
   labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-sar/
Log:
MERGED: -r 3678:3697 https://svn.labs.jboss.com/labs/jbosslabs/trunk into qa .  Testing for Labs 1.1 continues.

Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/navigation/EntryFactory.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/navigation/EntryFactory.java	2006-04-13 20:59:48 UTC (rev 3697)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/navigation/EntryFactory.java	2006-04-13 21:14:55 UTC (rev 3698)
@@ -33,6 +33,7 @@
     private final static String PROJECTS_MENU  	= "projects-menu";
     private final static String PROJECT_MENU	= "project-menu";
     private final static String PROJECT_LINK	= "project-link";
+    private final static String WIKI_LINK       = "wiki-link";
     private final static String PAGE            = "page";
     private final static String LINK            = "link";
     private final static String FREEZONE        = "freezone";
@@ -88,6 +89,14 @@
             }
         }
 
+        if (WIKI_LINK.equals(type)) {
+            if (project != null) {
+                return new WikiLinkEntry(portalName, project, node);
+            } else {
+                return null;
+            }
+        }
+
         return null;
     }
 }

Copied: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/navigation/WikiLinkEntry.java (from rev 3697, labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/navigation/WikiLinkEntry.java)

Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsHelper.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsHelper.java	2006-04-13 20:59:48 UTC (rev 3697)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsHelper.java	2006-04-13 21:14:55 UTC (rev 3698)
@@ -80,7 +80,7 @@
 	public final static String PROJECT_DESC = "project.xml";
 	public final static String PROJECTS_DESC = "projects.xml";
 	
-	protected final static String LEVELS_DESC = "levels.xml";
+	public final static String LEVELS_DESC = "levels.xml";
 	protected final static String PAGES_DESC = "pages.xml";
 	protected final static String JEMS_DESC = "jems.xml";
 	protected final static String CATEGORIES_DESC = "categories.xml";

Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-navigation/src/java/org/jboss/forge/navigation/NavigationConfWatcher.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-navigation/src/java/org/jboss/forge/navigation/NavigationConfWatcher.java	2006-04-13 20:59:48 UTC (rev 3697)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-navigation/src/java/org/jboss/forge/navigation/NavigationConfWatcher.java	2006-04-13 21:14:55 UTC (rev 3698)
@@ -23,6 +23,7 @@
 
 import org.jboss.shotoku.cache.ShotokuResourceWatcher;
 import org.jboss.shotoku.cache.ChangeType;
+import org.jboss.forge.common.projects.ProjectsHelper;
 
 import java.util.Map;
 
@@ -37,6 +38,8 @@
 
     public NavigationDescriptor init(String key) {
         addWatchedPath(key, NavigationTools.getXmlCmPath(key));
+        addWatchedPath(key, key + "/" + ProjectsHelper.MEMBERS_DIR +
+                "/" + ProjectsHelper.LEVELS_DESC);
 
         return getDesc(key);
     }


Property changes on: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-sar
___________________________________________________________________
Name: svn:ignore
   + target

[Jboss-svn-commits] JBL Code SVN: r3697 - labs/jbosslabs/branches/qa/jbosslabs/portal-extensions

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

Author: dam...@jb...
Date: 2006-04-13 16:59:48 -0400 (Thu, 13 Apr 2006)
New Revision: 3697

Modified:
   labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/
Log:
Updating qa branch externals to point to shotoku qa branch.


Property changes on: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions
___________________________________________________________________
Name: svn:externals
   - shotoku 			http://anonsvn.labs.jboss.com/labs/shotoku/trunk

   + shotoku 			http://anonsvn.labs.jboss.com/labs/shotoku/branches/qa

[Jboss-svn-commits] JBL Code SVN: r3696 - labs/shotoku/branches

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

Author: dam...@jb...
Date: 2006-04-13 16:57:35 -0400 (Thu, 13 Apr 2006)
New Revision: 3696

Added:
   labs/shotoku/branches/qa/
Log:
BRANCHED: shotoku/trunk to shotoku/branches/qa.

Copied: labs/shotoku/branches/qa (from rev 3695, labs/shotoku/trunk)

[Jboss-svn-commits] JBL Code SVN: r3695 - labs/jbosswebnp trunk/labs

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

Author: dam...@jb...
Date: 2006-04-13 16:35:28 -0400 (Thu, 13 Apr 2006)
New Revision: 3695

Added:
   labs/jbosswebnp/trunk/
Removed:
   trunk/labs/jbosswebnp/
Log:
Moving jbosswebnp.

Copied: labs/jbosswebnp/trunk (from rev 3694, trunk/labs/jbosswebnp)

[Jboss-svn-commits] JBL Code SVN: r3694 - labs/jbosswebnp

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

Author: dam...@jb...
Date: 2006-04-13 16:34:51 -0400 (Thu, 13 Apr 2006)
New Revision: 3694

Added:
   labs/jbosswebnp/tags/
Log:
Moving jbosswebnp.

[Jboss-svn-commits] JBL Code SVN: r3693 - labs/jbosswebnp

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

Author: dam...@jb...
Date: 2006-04-13 16:34:46 -0400 (Thu, 13 Apr 2006)
New Revision: 3693

Added:
   labs/jbosswebnp/branches/
Log:
Moving jbosswebnp.

[Jboss-svn-commits] JBL Code SVN: r3692 - labs

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

Author: dam...@jb...
Date: 2006-04-13 16:34:40 -0400 (Thu, 13 Apr 2006)
New Revision: 3692

Added:
   labs/jbosswebnp/
Log:
Moving jbosswebnp.

[Jboss-svn-commits] JBL Code SVN: r3691 - in labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views: . category common errors forums summary topics user

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

Author: unibrew
Date: 2006-04-13 16:22:22 -0400 (Thu, 13 Apr 2006)
New Revision: 3691

Modified:
   labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/category/viewcategory_body.xhtml
   labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/common/common.xhtml
   labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/errors/error_body.xhtml
   labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/forums/viewforum_body.xhtml
   labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/index.xhtml
   labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/portal_index.xhtml
   labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/summary/viewsummary_body.xhtml
   labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/topics/attachmentsview.xhtml
   labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/topics/posting_body.xhtml
   labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/topics/posting_preview.xhtml
   labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/topics/viewtopic_body.xhtml
   labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/user/usermessage_body.xhtml
   labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/user/viewuser_body.xhtml
Log:
[JBFORUMS-33] Adding LGPL licenses to xhtml files.

Modified: labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/category/viewcategory_body.xhtml
===================================================================
--- labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/category/viewcategory_body.xhtml	2006-04-13 20:20:22 UTC (rev 3690)
+++ labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/category/viewcategory_body.xhtml	2006-04-13 20:22:22 UTC (rev 3691)
@@ -1,3 +1,27 @@
+<!--
+/*
+* 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.
+*/
+-->
+
 <div  xmlns="http://www.w3.org/1999/xhtml"
       xmlns:ui="http://java.sun.com/jsf/facelets"
       xmlns:c="http://java.sun.com/jstl/core"

Modified: labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/common/common.xhtml
===================================================================
--- labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/common/common.xhtml	2006-04-13 20:20:22 UTC (rev 3690)
+++ labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/common/common.xhtml	2006-04-13 20:22:22 UTC (rev 3691)
@@ -1,3 +1,27 @@
+<!--
+/*
+* 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.
+*/
+-->
+
 <div  xmlns="http://www.w3.org/1999/xhtml"
       xmlns:ui="http://java.sun.com/jsf/facelets"
       xmlns:c="http://java.sun.com/jstl/core"

Modified: labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/errors/error_body.xhtml
===================================================================
--- labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/errors/error_body.xhtml	2006-04-13 20:20:22 UTC (rev 3690)
+++ labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/errors/error_body.xhtml	2006-04-13 20:22:22 UTC (rev 3691)
@@ -1,3 +1,27 @@
+<!--
+/*
+* 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.
+*/
+-->
+
 <div  xmlns="http://www.w3.org/1999/xhtml"
       xmlns:ui="http://java.sun.com/jsf/facelets"
       xmlns:c="http://java.sun.com/jstl/core"

Modified: labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/forums/viewforum_body.xhtml
===================================================================
--- labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/forums/viewforum_body.xhtml	2006-04-13 20:20:22 UTC (rev 3690)
+++ labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/forums/viewforum_body.xhtml	2006-04-13 20:22:22 UTC (rev 3691)
@@ -1,3 +1,27 @@
+<!--
+/*
+* 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.
+*/
+-->
+
 <div  xmlns="http://www.w3.org/1999/xhtml"
       xmlns:ui="http://java.sun.com/jsf/facelets"
       xmlns:c="http://java.sun.com/jstl/core"

Modified: labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/index.xhtml
===================================================================
--- labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/index.xhtml	2006-04-13 20:20:22 UTC (rev 3690)
+++ labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/index.xhtml	2006-04-13 20:22:22 UTC (rev 3691)
@@ -1,3 +1,27 @@
+<!--
+/*
+* 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.
+*/
+-->
+
 <div  xmlns="http://www.w3.org/1999/xhtml"
       xmlns:ui="http://java.sun.com/jsf/facelets"
       xmlns:c="http://java.sun.com/jstl/core"

Modified: labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/portal_index.xhtml
===================================================================
--- labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/portal_index.xhtml	2006-04-13 20:20:22 UTC (rev 3690)
+++ labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/portal_index.xhtml	2006-04-13 20:22:22 UTC (rev 3691)
@@ -1,3 +1,27 @@
+<!--
+/*
+* 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.
+*/
+-->
+
 <div  xmlns="http://www.w3.org/1999/xhtml"
       xmlns:ui="http://java.sun.com/jsf/facelets"
       xmlns:c="http://java.sun.com/jstl/core"

Modified: labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/summary/viewsummary_body.xhtml
===================================================================
--- labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/summary/viewsummary_body.xhtml	2006-04-13 20:20:22 UTC (rev 3690)
+++ labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/summary/viewsummary_body.xhtml	2006-04-13 20:22:22 UTC (rev 3691)
@@ -1,3 +1,27 @@
+<!--
+/*
+* 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.
+*/
+-->
+
 <div  xmlns="http://www.w3.org/1999/xhtml"
       xmlns:ui="http://java.sun.com/jsf/facelets"
       xmlns:c="http://java.sun.com/jstl/core"

Modified: labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/topics/attachmentsview.xhtml
===================================================================
--- labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/topics/attachmentsview.xhtml	2006-04-13 20:20:22 UTC (rev 3690)
+++ labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/topics/attachmentsview.xhtml	2006-04-13 20:22:22 UTC (rev 3691)
@@ -1,3 +1,27 @@
+<!--
+/*
+* 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.
+*/
+-->
+
 <div  xmlns="http://www.w3.org/1999/xhtml"
       xmlns:ui="http://java.sun.com/jsf/facelets"
       xmlns:c="http://java.sun.com/jstl/core"

Modified: labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/topics/posting_body.xhtml
===================================================================
--- labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/topics/posting_body.xhtml	2006-04-13 20:20:22 UTC (rev 3690)
+++ labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/topics/posting_body.xhtml	2006-04-13 20:22:22 UTC (rev 3691)
@@ -1,3 +1,27 @@
+<!--
+/*
+* 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.
+*/
+-->
+
 <div  xmlns="http://www.w3.org/1999/xhtml"
       xmlns:ui="http://java.sun.com/jsf/facelets"
       xmlns:c="http://java.sun.com/jstl/core"

Modified: labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/topics/posting_preview.xhtml
===================================================================
--- labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/topics/posting_preview.xhtml	2006-04-13 20:20:22 UTC (rev 3690)
+++ labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/topics/posting_preview.xhtml	2006-04-13 20:22:22 UTC (rev 3691)
@@ -1,3 +1,27 @@
+<!--
+/*
+* 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.
+*/
+-->
+
 <table xmlns="http://www.w3.org/1999/xhtml"
        xmlns:ui="http://java.sun.com/jsf/facelets"
        xmlns:c="http://java.sun.com/jstl/core"

Modified: labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/topics/viewtopic_body.xhtml
===================================================================
--- labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/topics/viewtopic_body.xhtml	2006-04-13 20:20:22 UTC (rev 3690)
+++ labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/topics/viewtopic_body.xhtml	2006-04-13 20:22:22 UTC (rev 3691)
@@ -1,3 +1,27 @@
+<!--
+/*
+* 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.
+*/
+-->
+
 <div xmlns="http://www.w3.org/1999/xhtml"
      xmlns:ui="http://java.sun.com/jsf/facelets"
      xmlns:c="http://java.sun.com/jstl/core"
@@ -297,16 +321,6 @@
                               </c:if>
                               <c:if test="${forums:userProperty(postrow.poster.user.properties,'INFO_USER_IM_SKYPE') ne null}">
                                 <!-- TODO: some more functionality may be added. Like automatic skype instalation and status checker.-->
-                                
-                                <!--<h:outputLink value="#{resource.SKYPE_URL}" style="text-decoration: none;">
-                                    <f:param value="#{forums:userProperty(postrow.poster.user.properties,'INFO_USER_IM_SKYPE')}" />
-                                    <f:verbatim>
-                                        <img border="0"
-                                             src="#{forums:themeURL('resourceIconSkypeURL')}"
-                                             alt="${resource.L_SKYPE}"/>
-                                    </f:verbatim>                                    
-                                 </h:outputLink>-->
-
                                  <h:outputLink value="skype:#{forums:userProperty(postrow.poster.user.properties,'INFO_USER_IM_SKYPE')}?add" style="text-decoration: none;">
                                     <f:verbatim>
                                         <img border="0"
@@ -358,7 +372,7 @@
                </tr>
             </c:forEach>
          </outPOLL_DISPLAY-->
-         <tr align="center">
+         <!--tr align="center">
             <td class="catBottom" colspan="2" height="28">
                 <table cellspacing="0" cellpadding="0" border="0">
 			<tr>
@@ -372,7 +386,7 @@
                         </tr>
 		</table>
             </td>
- 	 </tr>
+ 	 </tr-->
       </table>
    </c:if>
 <!--    

Modified: labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/user/usermessage_body.xhtml
===================================================================
--- labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/user/usermessage_body.xhtml	2006-04-13 20:20:22 UTC (rev 3690)
+++ labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/user/usermessage_body.xhtml	2006-04-13 20:22:22 UTC (rev 3691)
@@ -1,3 +1,27 @@
+<!--
+/*
+* 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.
+*/
+-->
+
 <div xmlns="http://www.w3.org/1999/xhtml"
      xmlns:ui="http://java.sun.com/jsf/facelets"
      xmlns:c="http://java.sun.com/jstl/core"

Modified: labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/user/viewuser_body.xhtml
===================================================================
--- labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/user/viewuser_body.xhtml	2006-04-13 20:20:22 UTC (rev 3690)
+++ labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/user/viewuser_body.xhtml	2006-04-13 20:22:22 UTC (rev 3691)
@@ -1,3 +1,27 @@
+<!--
+/*
+* 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.
+*/
+-->
+
 <div xmlns="http://www.w3.org/1999/xhtml"
      xmlns:ui="http://java.sun.com/jsf/facelets"
      xmlns:c="http://java.sun.com/jstl/core"

[Jboss-svn-commits] JBL Code SVN: r3690 - labs/jbossforums/trunk/forums/src/resources/portal-forums-war/WEB-INF/classes

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

Author: unibrew
Date: 2006-04-13 16:20:22 -0400 (Thu, 13 Apr 2006)
New Revision: 3690

Modified:
   labs/jbossforums/trunk/forums/src/resources/portal-forums-war/WEB-INF/classes/Resource.properties
Log:
[JBFORUMS-33] Removing communicators' urls from Resource Bundle.

Modified: labs/jbossforums/trunk/forums/src/resources/portal-forums-war/WEB-INF/classes/Resource.properties
===================================================================
--- labs/jbossforums/trunk/forums/src/resources/portal-forums-war/WEB-INF/classes/Resource.properties	2006-04-13 17:08:25 UTC (rev 3689)
+++ labs/jbossforums/trunk/forums/src/resources/portal-forums-war/WEB-INF/classes/Resource.properties	2006-04-13 20:20:22 UTC (rev 3690)
@@ -78,12 +78,7 @@
 AIM=AIM Address
 MSNM=MSN Messenger
 YIM=Yahoo Messenger
-ICQ_URL=d
-AIM_URL=d
-YIM_URL=d
-SKYPE_URL=skype:{0}?add
 
-
 # eg. sitename Forum Index, %s can be removed if you prefer
 Forum_Index_0=
 Forum_Index_1=&nbspForum Index

[Jboss-svn-commits] JBL Code SVN: r3689 - labs/jbossweb trunk/labs

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

Author: dam...@jb...
Date: 2006-04-13 13:08:25 -0400 (Thu, 13 Apr 2006)
New Revision: 3689

Added:
   labs/jbossweb/trunk/
Removed:
   trunk/labs/jbossweb/
Log:
Moving jbossweb.

Copied: labs/jbossweb/trunk (from rev 3688, trunk/labs/jbossweb)