Menu
▾
▴
jboss-svn-commits — JBoss SVN commit notifications
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(233) |
Sep
(199) |
Oct
(206) |
Nov
(185) |
Dec
(270) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(232) |
Feb
(426) |
Mar
(623) |
Apr
(592) |
May
(506) |
Jun
(389) |
Jul
(160) |
Aug
(3) |
Sep
(1) |
Oct
(1) |
Nov
(2) |
Dec
(5) |
| 2007 |
Jan
(1) |
Feb
(1) |
Mar
(2) |
Apr
(2) |
May
(4) |
Jun
(2) |
Jul
|
Aug
(3) |
Sep
(5) |
Oct
(9) |
Nov
(6) |
Dec
(6) |
| 2008 |
Jan
(3) |
Feb
|
Mar
(1) |
Apr
(3) |
May
(3) |
Jun
(5) |
Jul
(10) |
Aug
(2) |
Sep
(12) |
Oct
(10) |
Nov
(54) |
Dec
(49) |
| 2009 |
Jan
(19) |
Feb
(13) |
Mar
(20) |
Apr
(24) |
May
(44) |
Jun
(29) |
Jul
(32) |
Aug
(10) |
Sep
(7) |
Oct
(10) |
Nov
(4) |
Dec
(17) |
| 2010 |
Jan
(14) |
Feb
(5) |
Mar
(23) |
Apr
(50) |
May
(31) |
Jun
(9) |
Jul
(5) |
Aug
(4) |
Sep
(7) |
Oct
(5) |
Nov
(2) |
Dec
(3) |
| 2011 |
Jan
(12) |
Feb
(5) |
Mar
(5) |
Apr
(3) |
May
(4) |
Jun
(3) |
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2012 |
Jan
(1) |
Feb
(2) |
Mar
|
Apr
(1) |
May
(1) |
Jun
(2) |
Jul
(4) |
Aug
(1) |
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(2) |
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(3) |
Sep
|
Oct
|
Nov
|
Dec
(1) |
| 2015 |
Jan
|
Feb
|
Mar
(2) |
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <jbo...@li...> - 2006-04-26 03:24:18
|
Author: mic...@jb...
Date: 2006-04-25 23:23:59 -0400 (Tue, 25 Apr 2006)
New Revision: 3966
Modified:
labs/jbossrules/trunk/documentation/manual/en/Chapter-Rule_Language/Section-Rule.xml
Log:
doco on the RHS
Modified: labs/jbossrules/trunk/documentation/manual/en/Chapter-Rule_Language/Section-Rule.xml
===================================================================
--- labs/jbossrules/trunk/documentation/manual/en/Chapter-Rule_Language/Section-Rule.xml 2006-04-26 02:27:34 UTC (rev 3965)
+++ labs/jbossrules/trunk/documentation/manual/en/Chapter-Rule_Language/Section-Rule.xml 2006-04-26 03:23:59 UTC (rev 3966)
@@ -71,6 +71,40 @@
</section>
<section>
+ <title>The Right Hand Side</title>
+
+ <para>The Right Hand Side (RHS) is a common name for the consequence or
+ action part of the rule. The purpose of the right hand side is to retract
+ or add facts to working memory, and also invoke arbitary actions specific
+ to your application. In practical terms, the RHS is a block of code that
+ is executed when the rule fires.</para>
+
+ <para>There are a few convenience methods you can use to modify working
+ memory: </para>
+
+ <para>"modify(obj);" will tell the engine that an object has changed (one
+ that has been bound to something on the LHS) and rules may need to be
+ reconsidered. </para>
+
+ <para>"assert(new Something());" will place a new object of your creation
+ in working memory. </para>
+
+ <para>"assertLogical(new Something());" is similar to assert, but the
+ object will be automatically retracted when there are no more facts to
+ support the truth of the currently firing rule. </para>
+
+ <para>"retract(obj);" removes an object from working memory. </para>
+
+ <para>These convenience methods are basically macros that provide short
+ cuts to the KnowldgeHelper instance (refer to the KnowledgeHelper
+ interface for more advanced operations). The KnowledgeHelper interface is
+ made available to the RHS code block as a variable called "drools". If you
+ provide "Property Change Listeners" to your java beans that you are
+ asserting into the engine, you can avoid the need to call "modify" when
+ the object changes.</para>
+ </section>
+
+ <section>
<title>Rule Attriutes</title>
<para></para>
@@ -671,7 +705,7 @@
<title>or with binding</title>
<programlisting>pensioner : Person( sex == "f", age > 60 ) || pensioner : Person( sex == "m", age > 65 )
-pensioner : Person( sex == "f", age > 60 ) or pensioner : Person( sex == "m", age > 65 )</programlisting>
+pensioner : ( Person( sex == "f", age > 60 ) or Person( sex == "m", age > 65 ) )</programlisting>
</example>
<para>Care must be taken when binding with an "or" conditional element,
@@ -714,7 +748,7 @@
<para>For folks who are familiar with Drools 2.x lineage, the old Drools
paramater and condition tags are equivalent to:</para>
- <para>p1 : Parameter() p2 : Parameter() </para>
+ <para>p1 : Parameter() p2 : Parameter()</para>
<para>eval( /* your condition here, involving the parameters */)</para>
@@ -819,7 +853,7 @@
</figure>
<para>Grouping is similar to using parentheses in algebra, it makes the
- order of operations explicit. </para>
+ order of operations explicit.</para>
</section>
</section>
</section>
\ No newline at end of file
|
|
From: <jbo...@li...> - 2006-04-26 02:27:42
|
Author: mic...@jb... Date: 2006-04-25 22:27:34 -0400 (Tue, 25 Apr 2006) New Revision: 3965 Modified: labs/jbossrules/trunk/documentation/manual/en/Chapter-Rule_Engine/Section-What_is_a_Rule_Engine.xml Log: some background Modified: labs/jbossrules/trunk/documentation/manual/en/Chapter-Rule_Engine/Section-What_is_a_Rule_Engine.xml =================================================================== --- labs/jbossrules/trunk/documentation/manual/en/Chapter-Rule_Engine/Section-What_is_a_Rule_Engine.xml 2006-04-26 01:47:28 UTC (rev 3964) +++ labs/jbossrules/trunk/documentation/manual/en/Chapter-Rule_Engine/Section-What_is_a_Rule_Engine.xml 2006-04-26 02:27:34 UTC (rev 3965) @@ -2,6 +2,20 @@ <section> <title>What is a Rule Engine</title> + <section> + <title>Background</title> + <para> + A rule engine like Drools is centred around the concept of production rules (IF conditions THEN actions). Emil Leon Post (http://en.wikipedia.org/wiki/Emil_Leon_Post) was the first to use production systems in logic - as a consequence of this he was able to prove that any logical system (including mathematics) could be written with production rules. Quite an amazing proof, this essentially means that you can represent any system/problem with production rules (back in the real world there are constraints of processing power and efficiency of course !). + </para> + + <para> + You may also have heard of "Expert Systems" in the context of rule engines. You can think of expert systems as a rule engine + the codification of knowledge for a specific problem domain (+ a user interface !). In that sense, Drools is a platform for expert systems. Historically, rule engines popularity grew out of expert systems success (for example, EMYCIN was one of the first "shells" for an expert system, which was created from the MYCIN medical diagnosis expert system). + </para> + + </section> + + <section> + <title>Rules</title> <para>A <indexterm> <primary>Rule</primary> </indexterm>Rule is the codification of business knowledge. A Rule has @@ -270,4 +284,6 @@ <indexterm> <primary>Activation</primary> </indexterm>Activations.</para> + + </section> </section> \ No newline at end of file |
|
From: <jbo...@li...> - 2006-04-26 01:47:33
|
Author: mic...@jb...
Date: 2006-04-25 21:47:28 -0400 (Tue, 25 Apr 2006)
New Revision: 3964
Modified:
labs/jbossrules/trunk/documentation/manual/en/Chapter-Rule_Engine/Section-What_is_a_Rule_Engine.xml
Log:
Modified: labs/jbossrules/trunk/documentation/manual/en/Chapter-Rule_Engine/Section-What_is_a_Rule_Engine.xml
===================================================================
--- labs/jbossrules/trunk/documentation/manual/en/Chapter-Rule_Engine/Section-What_is_a_Rule_Engine.xml 2006-04-26 01:03:32 UTC (rev 3963)
+++ labs/jbossrules/trunk/documentation/manual/en/Chapter-Rule_Engine/Section-What_is_a_Rule_Engine.xml 2006-04-26 01:47:28 UTC (rev 3964)
@@ -115,7 +115,7 @@
</indexterm>Rete implementation is called ReteOO signifying that this
Drools has an enhanced and optimised implementation of the Rete algorithm.
Other Rete based engines also have marketting terms for their prioprietary
- enhancements to Rete, like RetePlus and Rete III, </para>
+ enhancements to Rete, like RetePlus and Rete III,</para>
<figure>
<title>A Basic Rete network</title>
@@ -260,8 +260,9 @@
construct instead of a Query the Terminal Node's Consequence would have
attempted to fire twice, once for "cheddar" and once for "mozarella".</para>
- <para>When a Rule is Fully Matched it does not fire immediately. Instead the
- Rule plus the matched Facts are <indexterm>
+ <para>When a Rule is Fully Matched it does not fire immediately (in Rete,
+ but in Leaps it does !). Instead the Rule plus the matched Facts are
+ <indexterm>
<primary>Activated</primary>
</indexterm>Activated placed onto the <indexterm>
<primary>Agenda</primary>
|
|
From: <jbo...@li...> - 2006-04-26 01:03:45
|
Author: mic...@jb...
Date: 2006-04-25 21:03:32 -0400 (Tue, 25 Apr 2006)
New Revision: 3963
Modified:
labs/jbossrules/trunk/documentation/manual/en/Chapter-Rule_Language/Section-XML.xml
Log:
Modified: labs/jbossrules/trunk/documentation/manual/en/Chapter-Rule_Language/Section-XML.xml
===================================================================
--- labs/jbossrules/trunk/documentation/manual/en/Chapter-Rule_Language/Section-XML.xml 2006-04-25 23:48:28 UTC (rev 3962)
+++ labs/jbossrules/trunk/documentation/manual/en/Chapter-Rule_Language/Section-XML.xml 2006-04-26 01:03:32 UTC (rev 3963)
@@ -142,7 +142,9 @@
<column object-type="Zaa" />
</or>
- <eval expression="1==1" />
+ <eval>
+ 1==1
+ </eval>
</lhs>
<rhs>
@@ -171,6 +173,13 @@
can nest things further). "Exists" and "Not" work around Columns, to check
for the existence or non existance of a fact meeting its
constraints.</para>
+
+ <para>The Eval element allows the execution of a valid snippet of java
+ code - as long as it evaluates to a boolean (do not end it with a
+ semi-colon, as it is just a fragment) - this can include calling a
+ function. The Eval is less efficient then then columns, as the rule engine
+ has to evaluate it each time, but it is a "catch all" feature for when you
+ can express what you need to do with Column constraints.</para>
</section>
<section>
@@ -219,10 +228,10 @@
<example>
<title>Drools 3 XML equivalent</title>
- <programlisting><rule name="my rule">
+ <programlisting><rule name="Goodbye Cruel World">
<lhs>
<column identifier='goodbye' object-type='String' >
- <eval expression='goodbye.equals("Goodbye")'/>
+ <eval>goodbye.equals("Goodbye")</eval>
</lhs>
<rhs>
goodbyeWorld( goodbye );
|
Author: mar...@jb...
Date: 2006-04-25 19:48:28 -0400 (Tue, 25 Apr 2006)
New Revision: 3962
Modified:
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/EvalDescr.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/PredicateDescr.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/ReturnValueDescr.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/EvalHandler.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/PredicateHandler.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/ReturnValueHandler.java
labs/jbossrules/trunk/drools-compiler/src/main/resources/META-INF/drools-3.0.xsd
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/xml/test_ParseLhs.xml
Log:
JBRULES-61 XML Bindings
-predicate, return-value and eval now all take the expression as xml content, rather than an attribute.
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/EvalDescr.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/EvalDescr.java 2006-04-25 16:49:28 UTC (rev 3961)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/EvalDescr.java 2006-04-25 23:48:28 UTC (rev 3962)
@@ -28,6 +28,9 @@
private String[] declarations;
private String classMethodName;
+
+ public EvalDescr() {
+ }
public EvalDescr(String text) {
this.text = text;
@@ -36,6 +39,10 @@
public String getText() {
return this.text;
}
+
+ public void setText(String text) {
+ this.text = text;
+ }
public String getClassMethodName() {
return this.classMethodName;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/PredicateDescr.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/PredicateDescr.java 2006-04-25 16:49:28 UTC (rev 3961)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/PredicateDescr.java 2006-04-25 23:48:28 UTC (rev 3962)
@@ -19,12 +19,18 @@
public class PredicateDescr extends PatternDescr {
private final String fieldName;
- private final String text;
+ private String text;
private final String declaration;
private String[] declarations;
private String classMethodName;
+
+ public PredicateDescr(String fieldName,
+ String declaration) {
+ this.fieldName = fieldName;
+ this.declaration = declaration;
+ }
public PredicateDescr(String fieldName,
String declaration,
@@ -50,6 +56,10 @@
return this.text;
}
+ public void setText(String text) {
+ this.text = text;
+ }
+
public String getDeclaration() {
return this.declaration;
}
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/ReturnValueDescr.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/ReturnValueDescr.java 2006-04-25 16:49:28 UTC (rev 3961)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/ReturnValueDescr.java 2006-04-25 23:48:28 UTC (rev 3962)
@@ -23,6 +23,13 @@
private String[] declarations;
private String classMethodName;
+
+ public ReturnValueDescr(String fieldName,
+ String evaluator) {
+ this.fieldName = fieldName;
+ this.evaluator = evaluator;
+ }
+
public ReturnValueDescr(String fieldName,
String evaluator,
@@ -51,6 +58,10 @@
public String getText() {
return this.text;
}
+
+ public void setText(String text) {
+ this.text = text;
+ }
public void setDeclarations(String[] declarations) {
this.declarations = declarations;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/EvalHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/EvalHandler.java 2006-04-25 16:49:28 UTC (rev 3961)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/EvalHandler.java 2006-04-25 23:48:28 UTC (rev 3962)
@@ -67,15 +67,9 @@
xmlPackageReader.startConfiguration( localName,
attrs );
- String expression = attrs.getValue( "expression" );
- if ( expression == null || expression.trim().equals( "" ) ) {
- throw new SAXParseException( "<eval> must have some content",
- xmlPackageReader.getLocator() );
- }
+ EvalDescr evalDescr = new EvalDescr( );
- EvalDescr evalDescr = new EvalDescr( expression );
-
return evalDescr;
}
@@ -84,7 +78,17 @@
Configuration config = xmlPackageReader.endConfiguration();
EvalDescr evalDescr = (EvalDescr) this.xmlPackageReader.getCurrent();
+
+ String expression = config.getText();
+
+ if ( expression == null || expression.trim().equals( "" ) ) {
+ throw new SAXParseException( "<eval> must have some content",
+ xmlPackageReader.getLocator() );
+ }
+
+ evalDescr.setText( expression );
+
LinkedList parents = this.xmlPackageReader.getParents();
ListIterator it = parents.listIterator( parents.size() );
it.previous();
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/PredicateHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/PredicateHandler.java 2006-04-25 16:49:28 UTC (rev 3961)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/PredicateHandler.java 2006-04-25 23:48:28 UTC (rev 3962)
@@ -75,15 +75,8 @@
xmlPackageReader.getLocator() );
}
- String expression = attrs.getValue( "expression" );
- if ( expression == null || expression.trim().equals( "" ) ) {
- throw new SAXParseException( "<predicate> requires an expression",
- xmlPackageReader.getLocator() );
- }
-
PredicateDescr predicateDescr = new PredicateDescr( fieldName,
- identifier,
- expression );
+ identifier );
return predicateDescr;
}
@@ -93,7 +86,16 @@
Configuration config = xmlPackageReader.endConfiguration();
PredicateDescr predicateDescr = (PredicateDescr) this.xmlPackageReader.getCurrent();
+
+ String expression = config.getText();
+ if ( expression == null || expression.trim().equals( "" ) ) {
+ throw new SAXParseException( "<predicate> must have some content",
+ xmlPackageReader.getLocator() );
+ }
+
+ predicateDescr.setText( expression );
+
LinkedList parents = this.xmlPackageReader.getParents();
ListIterator it = parents.listIterator( parents.size() );
it.previous();
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/ReturnValueHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/ReturnValueHandler.java 2006-04-25 16:49:28 UTC (rev 3961)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/ReturnValueHandler.java 2006-04-25 23:48:28 UTC (rev 3962)
@@ -75,15 +75,8 @@
xmlPackageReader.getLocator() );
}
- String expression = attrs.getValue( "expression" );
- if ( expression == null || expression.trim().equals( "" ) ) {
- throw new SAXParseException( "<return-value> requires an 'expression' attribute",
- xmlPackageReader.getLocator() );
- }
-
ReturnValueDescr returnValueDescr = new ReturnValueDescr( fieldName,
- evaluator,
- expression );
+ evaluator );
return returnValueDescr;
}
@@ -93,7 +86,16 @@
Configuration config = xmlPackageReader.endConfiguration();
ReturnValueDescr returnValueDescr = (ReturnValueDescr) this.xmlPackageReader.getCurrent();
+
+ String expression = config.getText();
+ if ( expression == null || expression.trim().equals( "" ) ) {
+ throw new SAXParseException( "<return-value> must have some content",
+ xmlPackageReader.getLocator() );
+ }
+
+ returnValueDescr.setText( expression );
+
LinkedList parents = this.xmlPackageReader.getParents();
ListIterator it = parents.listIterator( parents.size() );
it.previous();
Modified: labs/jbossrules/trunk/drools-compiler/src/main/resources/META-INF/drools-3.0.xsd
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/resources/META-INF/drools-3.0.xsd 2006-04-25 16:49:28 UTC (rev 3961)
+++ labs/jbossrules/trunk/drools-compiler/src/main/resources/META-INF/drools-3.0.xsd 2006-04-25 23:48:28 UTC (rev 3962)
@@ -163,11 +163,7 @@
</xs:complexType>
</xs:element>
- <xs:element name="eval">
- <xs:complexType>
- <xs:attribute name="expression" type="xs:string" use="required"/>
- </xs:complexType>
- </xs:element>
+ <xs:element name="eval" type="xs:string" />
<xs:element name="column">
<xs:complexType>
@@ -200,19 +196,25 @@
<xs:element name="predicate">
<xs:complexType>
- <xs:attribute name="field-name" type="xs:string" use="required"/>
- <xs:attribute name="identifier" type="xs:string" use="required"/>
- <xs:attribute name="expression" type="xs:string" use="required"/>
+ <xs:simpleContent>
+ <xs:extension base="xs:string">
+ <xs:attribute name="field-name" type="xs:string" use="required"/>
+ <xs:attribute name="identifier" type="xs:string" use="required"/>
+ </xs:extension>
+ </xs:simpleContent>
</xs:complexType>
</xs:element>
-
+
<xs:element name="return-value">
<xs:complexType>
- <xs:attribute name="field-name" type="xs:string" use="required"/>
- <xs:attribute name="evaluator" type="xs:string" use="required"/>
- <xs:attribute name="expression" type="xs:string" use="required"/>
+ <xs:simpleContent>
+ <xs:extension base="xs:string">
+ <xs:attribute name="field-name" type="xs:string" use="required"/>
+ <xs:attribute name="evaluator" type="xs:string" use="required"/>
+ </xs:extension>
+ </xs:simpleContent>
</xs:complexType>
- </xs:element>
+ </xs:element>
<xs:element name="bound-variable">
<xs:complexType>
Modified: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/xml/test_ParseLhs.xml
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/xml/test_ParseLhs.xml 2006-04-25 16:49:28 UTC (rev 3961)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/xml/test_ParseLhs.xml 2006-04-25 23:48:28 UTC (rev 3962)
@@ -36,9 +36,9 @@
<column object-type="Foo">
<literal field-name="field1" evaluator="==" value="value1" />
- <predicate field-name="field1" identifier="var1" expression="1==1" />
+ <predicate field-name="field1" identifier="var1">1==1</predicate>
- <return-value field-name="field1" evaluator="==" expression="1==1" />
+ <return-value field-name="field1" evaluator="==">1==1</return-value>
<field-binding field-name="field1" identifier="var1" />
@@ -67,7 +67,7 @@
<column object-type="Zaa" />
</or>
- <eval expression="1==1" />
+ <eval>1==1</eval>
</lhs>
<rhs>
|
|
From: <jbo...@li...> - 2006-04-25 16:49:35
|
Author: mar...@jb...
Date: 2006-04-25 12:49:28 -0400 (Tue, 25 Apr 2006)
New Revision: 3961
Modified:
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/TupleSource.java
Log:
-reverse the cloning work
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/TupleSource.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/TupleSource.java 2006-04-25 14:01:01 UTC (rev 3960)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/TupleSource.java 2006-04-25 16:49:28 UTC (rev 3961)
@@ -175,15 +175,9 @@
PropagationContext context,
WorkingMemoryImpl workingMemory) {
LinkedList list = tuple.getLinkedTuples();
-
if ( list != null && !list.isEmpty() ) {
- LinkedListNode[] clone = new LinkedListNode[list.size()];
- int i=0;
- for( LinkedListNode node = list.removeFirst(); node != null; node = list.removeFirst()) {
- clone[i++] = node;
- }
- for(i = 0; i < clone.length; i++) {
- LinkedListNode node = clone[i];
+ int i = 0;
+ for ( LinkedListNode node = list.removeFirst(); node != null; node = list.removeFirst() ) {
((TupleSink) getTupleSinks().get( i++ )).retractTuple( (ReteTuple) ((LinkedListNodeWrapper) node).getNode(),
context,
workingMemory );
|
|
From: <jbo...@li...> - 2006-04-25 14:01:12
|
Author: wrzep
Date: 2006-04-25 10:01:01 -0400 (Tue, 25 Apr 2006)
New Revision: 3960
Modified:
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusConfWatcher.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ServiceConf.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tags.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tools.java
Log:
JBLAB-599
Pawel
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java 2006-04-25 14:00:42 UTC (rev 3959)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java 2006-04-25 14:01:01 UTC (rev 3960)
@@ -78,14 +78,14 @@
* @param pluginsRoot Node defining Plugins used in the Matrix
*/
public Status(String portalName, Node statusRoot, Node pluginsRoot,
- Node serviceRoot) {
+ org.jboss.shotoku.Node serviceNode) {
log = Logger.getLogger(this.getClass());
// Get configuration
projects = ProjectsHelper.getProjects(portalName);
List<PluginConf> pluginsConf = getPluginsConfList(pluginsRoot);
- ServiceConf serviceConf = new ServiceConf(serviceRoot);
+ ServiceConf serviceConf = new ServiceConf(serviceNode);
ScoresManager.init(portalName, serviceConf);
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusConfWatcher.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusConfWatcher.java 2006-04-25 14:00:42 UTC (rev 3959)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusConfWatcher.java 2006-04-25 14:01:01 UTC (rev 3960)
@@ -42,7 +42,7 @@
addWatchedPath(key, Tools.getXmlCmPath(portalName));
addWatchedPath(key, Tools.getXmlStatusPluginsCmPath(portalName));
- addWatchedPath(key, Tools.getXmlServiceCmPath(portalName));
+ addWatchedPath(key, Tools.getServicePropertiesCmPath(portalName));
/* Watch projects.xml file */
addWatchedPath(key, Tools.getProjectsXmlPath(portalName));
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java 2006-04-25 14:00:42 UTC (rev 3959)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java 2006-04-25 14:01:01 UTC (rev 3960)
@@ -59,11 +59,11 @@
String pluginsPath = Tools.getXmlStatusPluginsCmPath(portalName);
Node pluginsRoot = getRoot(cm, pluginsPath);
- String servicePath = Tools.getXmlServiceCmPath(portalName);
- Node serviceRoot = getRoot(cm, servicePath);
+ String servicePath = Tools.getServicePropertiesCmPath(portalName);
+ org.jboss.shotoku.Node serviceNode = cm.getNode(servicePath);
status = new Status(portalName, statusRoot, pluginsRoot,
- serviceRoot);
+ serviceNode);
fillContext();
@@ -94,7 +94,8 @@
return columnContexts.get(id);
}
- private Node getRoot(ContentManager cm, String path) throws IOException, SAXException, ResourceDoesNotExist {
+ private Node getRoot(ContentManager cm, String path)
+ throws IOException, SAXException, ResourceDoesNotExist {
DOMParser parser = new DOMParser();
parser.parse(new InputSource(cm.getNode(path).getContentInputStream()));
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java 2006-04-25 14:00:42 UTC (rev 3959)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java 2006-04-25 14:01:01 UTC (rev 3960)
@@ -55,7 +55,7 @@
isRemote = serviceConf.isRemote();
System.out.println("remote: " + isRemote);
- properties = getServiceProperties();
+ properties = serviceConf.getProperties();
}
public static void save(Projects projects, List<PluginConf> pluginsConf)
@@ -142,17 +142,6 @@
* java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
* java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
* java.naming.provider.url=localhost:1099
+ * jnp.disableDiscovery=true
*/
-
- private static Properties getServiceProperties() {
-
- Properties props = new Properties();
-
- props.put(Context.INITIAL_CONTEXT_FACTORY,"org.jnp.interfaces.NamingContextFactory");
- props.put(Context.URL_PKG_PREFIXES, "org.jboss.naming:org.jnp.interfaces");
- props.put(Context.PROVIDER_URL, "localhost:1099");
- props.put("jnp.disableDiscovery", true);
-
- return properties;
- }
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ServiceConf.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ServiceConf.java 2006-04-25 14:00:42 UTC (rev 3959)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ServiceConf.java 2006-04-25 14:01:01 UTC (rev 3960)
@@ -24,11 +24,9 @@
import java.util.Properties;
-import org.jboss.forge.common.XmlTools;
import org.jboss.forge.status.tools.Tags;
+import org.jboss.shotoku.Node;
-import org.w3c.dom.Node;
-
/**
* @author Pawel Wrzeszcz (pawel.wrzeszcz [at] gmail.com)
*/
@@ -40,34 +38,42 @@
public ServiceConf(Node serviceNode) {
- remoteService = parseRemote(serviceNode);
+ properties = parseProperties(serviceNode);
- properties = parseProperties(serviceNode);
+ String remoteString = (String) properties.get(Tags.SERVICE_REMOTE_ELEMENT);
+ remoteService = remoteString.equals("true");
+
+ System.out.println("remote " + remoteService + "\n props: " + properties);
}
public boolean isRemote() {
return remoteService;
}
- private boolean parseRemote(Node serviceNode) {
-
- String remoteServiceString =
- XmlTools.getChildNodeValue(serviceNode,
- Tags.SERVICE_REMOTE_ELEMENT);
-
- if (remoteServiceString != null) {
- return (remoteServiceString == "true");
- }
-
- return false;
+ public Properties getProperties() {
+ return properties;
}
private Properties parseProperties(Node serviceNode) {
- Node propsNode =
- XmlTools.getFirstNodeWithName(serviceNode,
- Tags.SERVICE_PROPERTIES_ELEMENT);
+ if (serviceNode == null) {
+ return null;
+ }
- return XmlTools.parseProperties(propsNode);
+ Properties props = new Properties();
+
+ String propsString = serviceNode.getContent();
+ String[] propsArr = propsString.split("\n");
+
+ for (String propString : propsArr) {
+
+ String[] propArr = propString.split("=");
+ if ((propArr != null) && (propArr.length == 2)) {
+ props.put(propArr[0], propArr[1]);
+ }
+
+ }
+
+ return props;
}
}
\ No newline at end of file
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tags.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tags.java 2006-04-25 14:00:42 UTC (rev 3959)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tags.java 2006-04-25 14:01:01 UTC (rev 3960)
@@ -57,8 +57,7 @@
public static final String METRIC_PLUGIN_ELEMENT = "plugin";
/* service.xml tags */
- public static final String SERVICE_REMOTE_ELEMENT = "remote";
- public static final String SERVICE_PROPERTIES_ELEMENT = "properties";
+ public static final String SERVICE_REMOTE_ELEMENT = "service.remote";
/* plugins.xml tags */
public final static String PLUGIN_ELEMENT = "plugin";
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tools.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tools.java 2006-04-25 14:00:42 UTC (rev 3959)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tools.java 2006-04-25 14:01:01 UTC (rev 3960)
@@ -22,7 +22,7 @@
/** <code>STATUS_XML<code> - file defining the list of watched feeds */
private final static String STATUS_XML = "status.xml";
private final static String STATUS_PLUGINS_XML = "plugins.xml";
- private final static String STATUS_SERVICE_XML = "service.xml";
+ private final static String STATUS_SERVICE_PROPERTIES = "service.properties";
/** <code>STATUS_DIR</code> - directory in which file <code>STATUS_XML<code> is stored. */
private final static String STATUS_DIR = "status";
@@ -63,8 +63,8 @@
/**
* Path to the xml file defining ejb3 service.
*/
- public static String getXmlServiceCmPath(String portalName) {
- return portalName + "/" + STATUS_DIR + "/" + STATUS_SERVICE_XML;
+ public static String getServicePropertiesCmPath(String portalName) {
+ return portalName + "/" + STATUS_DIR + "/" + STATUS_SERVICE_PROPERTIES;
}
/**
|
|
From: <jbo...@li...> - 2006-04-25 14:01:01
|
Author: KrisVerlaenen
Date: 2006-04-25 10:00:42 -0400 (Tue, 25 Apr 2006)
New Revision: 3959
Modified:
labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/editors/completion/DefaultCompletionProcessor.java
Log:
Removed system.out
Modified: labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/editors/completion/DefaultCompletionProcessor.java
===================================================================
--- labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/editors/completion/DefaultCompletionProcessor.java 2006-04-25 12:25:37 UTC (rev 3958)
+++ labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/editors/completion/DefaultCompletionProcessor.java 2006-04-25 14:00:42 UTC (rev 3959)
@@ -71,7 +71,6 @@
CompletionRequestor requestor = new CompletionRequestor() {
public void accept(org.eclipse.jdt.core.CompletionProposal proposal) {
String className = new String(proposal.getCompletion());
- System.out.println(className);
if (proposal.getKind() == org.eclipse.jdt.core.CompletionProposal.PACKAGE_REF) {
RuleCompletionProposal prop = new RuleCompletionProposal(classNameStart.length(), className, className + ".");
prop.setImage(DroolsPluginImages.getImage(DroolsPluginImages.PACKAGE));
|
Author: wrzep
Date: 2006-04-25 08:25:37 -0400 (Tue, 25 Apr 2006)
New Revision: 3958
Modified:
labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/XmlTools.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/PluginConfImpl.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Plugins.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ServiceConf.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tags.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tools.java
Log:
JBLAB-599
enabled remote service conf through service.xml in cms
Pawel
Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/XmlTools.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/XmlTools.java 2006-04-25 06:22:38 UTC (rev 3957)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/XmlTools.java 2006-04-25 12:25:37 UTC (rev 3958)
@@ -23,6 +23,7 @@
import java.util.HashMap;
import java.util.Map;
+import java.util.Properties;
import javax.xml.transform.TransformerException;
@@ -263,4 +264,48 @@
return buf.toString();
}
+
+ /**
+ * Computes Properites from the given properties Node.
+ *
+ * @param propertiesNode Node matching the following pattern:
+ * <code><properties>
+ * <property>
+ * <name>propertyName</name>
+ * <value>propertyValue</value>
+ * </property>
+ * ...
+ * </properties></code>
+ * @return Properties or null if properties are not specified
+ */
+ public static Properties parseProperties(Node propertiesNode) {
+
+ if ((propertiesNode == null) ||
+ (propertiesNode.getNodeName() != "properties")) {
+ return null;
+ }
+
+ Properties props = new Properties();
+ NodeList nodes = propertiesNode.getChildNodes();
+
+ for (int i = 0; i < nodes.getLength(); i++) {
+ Node node = nodes.item(i);
+
+ if ((node.getNodeType() == Node.ELEMENT_NODE)
+ && (node.getNodeName() == "property")){
+
+ String propertyName =
+ XmlTools.getChildNodeValue(node, "name");
+ String propertyValue =
+ XmlTools.getChildNodeValue(node, "value");
+
+ if ((propertyName != null) && (propertyValue != null)) {
+ props.setProperty(propertyName, propertyValue);
+ }
+ }
+ }
+
+ return props;
+ }
+
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/PluginConfImpl.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/PluginConfImpl.java 2006-04-25 06:22:38 UTC (rev 3957)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/PluginConfImpl.java 2006-04-25 12:25:37 UTC (rev 3958)
@@ -31,7 +31,6 @@
import org.jboss.forge.status.service.model.PluginConf;
import org.jboss.forge.status.tools.Tags;
import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
/**
* @author Pawel Wrzeszcz
@@ -41,7 +40,7 @@
private static final long serialVersionUID = 8598887068548048511L;
private Map<String,String> fields = new HashMap<String,String>();
- private Properties properties = new Properties();
+ private Properties properties;
public PluginConfImpl(Node pluginNode)
throws InvalidPluginsConfigurationException {
@@ -54,7 +53,8 @@
Node pluginPropertiesNode =
XmlTools.getFirstNodeWithName(pluginNode,
Tags.PLUGIN_PROPERTIES_ELEMENT);
- addPluginProperties(pluginPropertiesNode);
+
+ properties = XmlTools.parseProperties(pluginPropertiesNode);
}
public String getFieldValue(String fieldName) {
@@ -78,37 +78,4 @@
fields.put(fieldName, fieldValue);
}
-
- /**
- * Computes plugin properites from given properties Node.
- *
- * @param propertiesNode Node containging plugin properties
- * @return plugin properties or null if properties are not specified
- */
- private void addPluginProperties(Node propertiesNode) {
-
- if (propertiesNode == null) {
- return;
- }
-
- NodeList nodes = propertiesNode.getChildNodes();
-
- for (int i = 0; i < nodes.getLength(); i++) {
- Node node = nodes.item(i);
-
- if ((node.getNodeType() == Node.ELEMENT_NODE)
- && (node.getNodeName() == "property")){
-
- String propertyName =
- XmlTools.getChildNodeValue(node, "name");
- String propertyValue =
- XmlTools.getChildNodeValue(node, "value");
-
- if ((propertyName != null) && (propertyValue != null)) {
- properties.setProperty(propertyName, propertyValue);
- }
- }
- }
- }
-
}
\ No newline at end of file
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java 2006-04-25 06:22:38 UTC (rev 3957)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java 2006-04-25 12:25:37 UTC (rev 3958)
@@ -65,9 +65,9 @@
@Service(objectName=Tools.STATUS_SERVICE_NAME)
@Management(ScoresService.class)
@Local(ScoresService.class)
-@LocalBinding(jndiBinding="Status/ScoresService")
+@LocalBinding(jndiBinding=Tools.STATUS_LOCAL_SERVICE)
@Remote(ScoresService.class)
-@RemoteBinding(jndiBinding="Status/RemoteScoresService")
+@RemoteBinding(jndiBinding=Tools.STATUS_REMOTE_SERVICE)
public class ScoresServiceImpl implements ScoresService {
private static Logger log = Logger.getLogger(ScoresServiceImpl.class);
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Plugins.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Plugins.java 2006-04-25 06:22:38 UTC (rev 3957)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Plugins.java 2006-04-25 12:25:37 UTC (rev 3958)
@@ -105,7 +105,6 @@
}
// Get plugin properties
-
Properties pluginProperties = pluginConf.getProperties();
// Get plugin instance;
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java 2006-04-25 06:22:38 UTC (rev 3957)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java 2006-04-25 12:25:37 UTC (rev 3958)
@@ -53,9 +53,9 @@
ScoresManager.portalName = portalName;
isRemote = serviceConf.isRemote();
- System.out.println("local: " + isRemote);
+ System.out.println("remote: " + isRemote);
- properties = getRemoteServiceProperties();
+ properties = getServiceProperties();
}
public static void save(Projects projects, List<PluginConf> pluginsConf)
@@ -122,15 +122,18 @@
private static ScoresService getService() throws NamingException {
- Context context = new InitialContext(); //////////////////////// properties
+ Context context = new InitialContext(properties);
// Perform look up using JNDI name of ejb object
- Object ref = context.lookup("Status/RemoteScoresService");
+ String serviceBinding =
+ (isRemote ? Tools.STATUS_REMOTE_SERVICE :
+ Tools.STATUS_LOCAL_SERVICE);
+ Object ref = context.lookup(serviceBinding);
// Narrow the reference of the object returned by lookup() method
- ScoresService service =
- (ScoresService)PortableRemoteObject.narrow( ref, ScoresService.class);
- System.out.println("ScoresService " + service);
+ ScoresService service =
+ (ScoresService) PortableRemoteObject.
+ narrow( ref, ScoresService.class);
return service;
}
@@ -141,12 +144,12 @@
* java.naming.provider.url=localhost:1099
*/
- private static Properties getRemoteServiceProperties() {
+ private static Properties getServiceProperties() {
Properties props = new Properties();
props.put(Context.INITIAL_CONTEXT_FACTORY,"org.jnp.interfaces.NamingContextFactory");
- props.put(Context.URL_PKG_PREFIXES, "rg.jboss.naming:org.jnp.interfaces");
+ props.put(Context.URL_PKG_PREFIXES, "org.jboss.naming:org.jnp.interfaces");
props.put(Context.PROVIDER_URL, "localhost:1099");
props.put("jnp.disableDiscovery", true);
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ServiceConf.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ServiceConf.java 2006-04-25 06:22:38 UTC (rev 3957)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ServiceConf.java 2006-04-25 12:25:37 UTC (rev 3958)
@@ -22,6 +22,8 @@
package org.jboss.forge.status.tools;
+import java.util.Properties;
+
import org.jboss.forge.common.XmlTools;
import org.jboss.forge.status.tools.Tags;
@@ -32,21 +34,40 @@
*/
public class ServiceConf {
- boolean remoteService = false;
+ boolean remoteService;
+ Properties properties;
+
public ServiceConf(Node serviceNode) {
+ remoteService = parseRemote(serviceNode);
+
+ properties = parseProperties(serviceNode);
+ }
+
+ public boolean isRemote() {
+ return remoteService;
+ }
+
+ private boolean parseRemote(Node serviceNode) {
+
String remoteServiceString =
- XmlTools.getChildNodeValue(serviceNode,
- Tags.SERVICE_REMOTE_ELEMENT);
-
+ XmlTools.getChildNodeValue(serviceNode,
+ Tags.SERVICE_REMOTE_ELEMENT);
+
if (remoteServiceString != null) {
- remoteService = (remoteServiceString == "true");
+ return (remoteServiceString == "true");
}
+ return false;
}
-
- public boolean isRemote() {
- return remoteService;
- }
+
+ private Properties parseProperties(Node serviceNode) {
+
+ Node propsNode =
+ XmlTools.getFirstNodeWithName(serviceNode,
+ Tags.SERVICE_PROPERTIES_ELEMENT);
+
+ return XmlTools.parseProperties(propsNode);
+ }
}
\ No newline at end of file
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tags.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tags.java 2006-04-25 06:22:38 UTC (rev 3957)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tags.java 2006-04-25 12:25:37 UTC (rev 3958)
@@ -58,6 +58,7 @@
/* service.xml tags */
public static final String SERVICE_REMOTE_ELEMENT = "remote";
+ public static final String SERVICE_PROPERTIES_ELEMENT = "properties";
/* plugins.xml tags */
public final static String PLUGIN_ELEMENT = "plugin";
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tools.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tools.java 2006-04-25 06:22:38 UTC (rev 3957)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tools.java 2006-04-25 12:25:37 UTC (rev 3958)
@@ -36,6 +36,8 @@
private static final String SHOTOKU_STATUS_DIR = "status";
public static final String STATUS_SERVICE_NAME = "status:service=scores";
+ public static final String STATUS_LOCAL_SERVICE = "Status/LocalScoresService";
+ public static final String STATUS_REMOTE_SERVICE = "Status/RemoteScoresService";
@CacheItem
private static StatusConfWatcher conf;
|
|
From: <jbo...@li...> - 2006-04-25 06:22:42
|
Author: mla...@jb... Date: 2006-04-25 02:22:38 -0400 (Tue, 25 Apr 2006) New Revision: 3957 Added: labs/jbossweb/trunk/src/share/resources/ROOT.war/index.jsp Removed: labs/jbossweb/trunk/src/share/resources/ROOT.war/index.html Log: Use jsp instead html for welcome page. Deleted: labs/jbossweb/trunk/src/share/resources/ROOT.war/index.html =================================================================== --- labs/jbossweb/trunk/src/share/resources/ROOT.war/index.html 2006-04-25 01:21:23 UTC (rev 3956) +++ labs/jbossweb/trunk/src/share/resources/ROOT.war/index.html 2006-04-25 06:22:38 UTC (rev 3957) @@ -1,81 +0,0 @@ -<html lang="en" xml:lang="en" xmlns="http://www.w3.org/1999/xhtml"> - <head> - <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> - <title>JBossWeb - Overview</title> - <meta name="author" value="Mladen Turk"> - <link href="style.css" type="text/css" rel="stylesheet"> - </head> -<body> - <table border="0" width="100%" cellspacing="4"> - <tr> - <td colspan="2"> - <a href="http://www.jboss.com/"><img src="images/jbosslogo.gif" align="left" alt="JBoss Inc." border="0"></a> - <a href="http://labs.jboss.com/portal/index.html?ctrl:id=page.default.info&project=jbossweb"><img src="images/jbossweblogo.gif" align="right" alt="JBossWeb @ JBoss labs" border="0"></a> - </td> - </tr> - <tr> - <td colspan="2"><hr noshade="noshade" size="1"> - </td> - </tr> - <tr> - <td width="80%" valign="top" align="left"> - <table border="0" cellspacing="0" cellpadding="0" width="100%"> - <tr> - <td class="section" colspan="2"><a name="Version">JBoss Web Server Version 4.0.4-CR2</a></td></tr><tr><td width="20px"> - </td> - <td><br> -<p><div align="center"><h1>It works!</h1></div> -</p> -<br> -<p> -JBoss Web Server is an enterprise ready web server designed for medium -and large applications, based on the -<a href="http://tomcat.apache.org">Apache Tomcat</a>. It is meant to -be used as a replacement for the standard Web servers on all major -platforms. JBoss Web Server provides organizations with a single -deployment platform for Java Server Pages (JSP) and Java Servlet -technologies, Microsoft .NET, PHP, and CGI. It uses a genuine high -performance hybrid technology that incorporates the best of the most -recent OS technologies for processing high volume data, while keeping -all the reference Java specifications. It supports both in and out of -the process execution of CGI and PHP scripts, as well as .NET applications. -The hybrid technology model offers the best from threading and event -processing models, and that makes the JBoss Web Server one of the fastest -and most scalable web servers in the market. -</p> -<br> -<br> -<p> - <ul> - <li><a href="/status">Server Status</a></li> - <li><a href="/status?full=true">Full Server Status</a></li> - <li><a href="/jmx-console/">JMX Console</a></li> - <li><a href="/web-console/">JBoss Web Console</a></li> - </ul> -</p> -<br> -<br> -<p> -<div align="center"> -<img src="images/jboss_ics.gif" alt="" border="0"> -<img src="images/tomcat_pb.gif" alt="" border="0"> -<img src="images/openssl_ics.gif" alt="" border="0"> -<img src="images/jbweb_pb.gif" alt="" border="0"> -</div> -</p> -</td> -</tr> -</table> -</td> -</tr> -<tr> - <td colspan="2"><hr noshade="noshade" size="1"> - </td> -</tr> -<tr> - <td colspan="2"><div align="center"><font color="#525D76" size="-1"><em>Copyright © 2006, JBoss Inc.</em></font></div> - </td> -</tr> -</table> -</body> -</html> \ No newline at end of file Added: labs/jbossweb/trunk/src/share/resources/ROOT.war/index.jsp =================================================================== --- labs/jbossweb/trunk/src/share/resources/ROOT.war/index.jsp 2006-04-25 01:21:23 UTC (rev 3956) +++ labs/jbossweb/trunk/src/share/resources/ROOT.war/index.jsp 2006-04-25 06:22:38 UTC (rev 3957) @@ -0,0 +1,83 @@ +<html lang="en" xml:lang="en" xmlns="http://www.w3.org/1999/xhtml"> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> + <title><%= application.getServerInfo() %></title> + <meta name="author" value="Mladen Turk"> + <link href="style.css" type="text/css" rel="stylesheet"> + </head> +<body> + <table border="0" width="100%" cellspacing="4"> + <tr> + <td colspan="2"> + <a href="http://www.jboss.com/"><img src="images/jbosslogo.gif" align="left" alt="JBoss Inc." border="0"></a> + <a href="http://labs.jboss.com/portal/index.html?ctrl:id=page.default.info&project=jbossweb"><img src="images/jbossweblogo.gif" align="right" alt="JBossWeb @ JBoss labs" border="0"></a> + </td> + </tr> + <tr> + <td colspan="2"><hr noshade="noshade" size="1"> + </td> + </tr> + <tr> + <td width="80%" valign="top" align="left"> + <table border="0" cellspacing="0" cellpadding="0" width="100%"> + <tr> + <td class="section" colspan="2"><a name="Version"><%= application.getServerInfo() %></a></td></tr><tr><td width="20px"> + </td> + <td><br> +<p><div align="center"><h1>It works!</h1></div> +</p> +<br> +<p> +JBoss Web Server is an enterprise ready web server designed for medium +and large applications, based on the +<a href="http://tomcat.apache.org">Apache Tomcat</a>. It is meant to +be used as a replacement for the standard Web servers on all major +platforms. JBoss Web Server provides organizations with a single +deployment platform for Java Server Pages (JSP) and Java Servlet +technologies, Microsoft .NET, PHP, and CGI. It uses a genuine high +performance hybrid technology that incorporates the best of the most +recent OS technologies for processing high volume data, while keeping +all the reference Java specifications. It supports both in and out of +the process execution of CGI and PHP scripts, as well as .NET applications. +The hybrid technology model offers the best from threading and event +processing models, and that makes the JBoss Web Server one of the fastest +and most scalable web servers in the market. +</p> +<br> +<br> +<p> + <ul> + <li><a href="/status">Server Status</a></li> + <li><a href="/status?full=true">Full Server Status</a></li> + <li><a href="/jmx-console/">JMX Console</a></li> + <!-- + <li><a href="/web-console/">JBoss Web Console</a></li> + --> + </ul> +</p> +<br> +<br> +<p> +<div align="center"> +<img src="images/jboss_ics.gif" alt="" border="0"> +<img src="images/tomcat_pb.gif" alt="" border="0"> +<img src="images/openssl_ics.gif" alt="" border="0"> +<img src="images/jbweb_pb.gif" alt="" border="0"> +</div> +</p> +</td> +</tr> +</table> +</td> +</tr> +<tr> + <td colspan="2"><hr noshade="noshade" size="1"> + </td> +</tr> +<tr> + <td colspan="2"><div align="center"><font color="#525D76" size="-1"><em>Copyright © 2006, JBoss Inc.</em></font></div> + </td> +</tr> +</table> +</body> +</html> \ No newline at end of file |
|
From: <jbo...@li...> - 2006-04-25 01:21:30
|
Author: mar...@jb...
Date: 2006-04-24 21:21:23 -0400 (Mon, 24 Apr 2006)
New Revision: 3956
Modified:
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/WorkingMemoryImpl.java
Log:
-WorkingMemory.getObjects() was returning handles, instead of the objects.
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/WorkingMemoryImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/WorkingMemoryImpl.java 2006-04-25 01:20:08 UTC (rev 3955)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/WorkingMemoryImpl.java 2006-04-25 01:21:23 UTC (rev 3956)
@@ -334,7 +334,7 @@
public List getObjects(Class objectClass) {
List matching = new java.util.LinkedList();
- for ( Iterator objIter = this.identityMap.values().iterator(); objIter.hasNext(); ) {
+ for ( Iterator objIter = this.identityMap.keySet().iterator(); objIter.hasNext(); ) {
Object obj = objIter.next();
if ( objectClass.isInstance( obj ) ) {
|
|
From: <jbo...@li...> - 2006-04-25 01:20:18
|
Author: mar...@jb...
Date: 2006-04-24 21:20:08 -0400 (Mon, 24 Apr 2006)
New Revision: 3955
Modified:
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/WorkingMemoryImpl.java
Log:
-WorkingMemory.getObjects() was returning handles, instead of the objects.
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/WorkingMemoryImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/WorkingMemoryImpl.java 2006-04-24 21:46:17 UTC (rev 3954)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/WorkingMemoryImpl.java 2006-04-25 01:20:08 UTC (rev 3955)
@@ -329,7 +329,7 @@
* @see WorkingMemory
*/
public List getObjects() {
- return new ArrayList( this.identityMap.values() );
+ return new ArrayList( this.identityMap.keySet() );
}
public List getObjects(Class objectClass) {
|
|
From: <jbo...@li...> - 2006-04-24 21:46:28
|
Author: wrzep
Date: 2006-04-24 17:46:17 -0400 (Mon, 24 Apr 2006)
New Revision: 3954
Modified:
labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/Projects.java
labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsConfigurationWatcher.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusConfWatcher.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/Columns.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ServiceConf.java
Log:
JBLAB-599
Pawel
Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/Projects.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/Projects.java 2006-04-24 19:53:02 UTC (rev 3953)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/Projects.java 2006-04-24 21:46:17 UTC (rev 3954)
@@ -21,6 +21,7 @@
*/
package org.jboss.forge.common.projects;
+import java.io.Serializable;
import java.util.Set;
import org.jboss.forge.common.projects.permissions.PermissionsChecker;
@@ -34,8 +35,11 @@
*
* @author adamw
*/
-public class Projects {
- private String portalName;
+public class Projects implements Serializable {
+
+ private static final long serialVersionUID = 7544648865350172685L;
+
+ private String portalName;
@CacheItem
private ProjectsConfigurationWatcher pcw;
Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsConfigurationWatcher.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsConfigurationWatcher.java 2006-04-24 19:53:02 UTC (rev 3953)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsConfigurationWatcher.java 2006-04-24 21:46:17 UTC (rev 3954)
@@ -25,11 +25,16 @@
import org.jboss.shotoku.cache.ShotokuResourceWatcher;
import org.jboss.shotoku.cache.ChangeType;
+import java.io.Serializable;
import java.util.Map;
public class ProjectsConfigurationWatcher
- extends ShotokuResourceWatcher<String, ProjectsDescriptor> {
- public ProjectsDescriptor getProjectsDescriptor(String key) {
+ extends ShotokuResourceWatcher<String, ProjectsDescriptor>
+ implements Serializable {
+
+ private static final long serialVersionUID = 3579287247264582665L;
+
+ public ProjectsDescriptor getProjectsDescriptor(String key) {
ProjectsDescriptor pd = new ProjectsDescriptor(
XmlInputFactory.getContentReadingInstance(
getContentManager(key)), key);
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusConfWatcher.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusConfWatcher.java 2006-04-24 19:53:02 UTC (rev 3953)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusConfWatcher.java 2006-04-24 21:46:17 UTC (rev 3954)
@@ -62,42 +62,4 @@
protected void update(String key, StatusDescriptor currentObject, Map<String, ChangeType> changes) {
put(key, getDesc(key));
}
-
- /*
-
- StatusDescriptor desc = new StatusDescriptor(portalName, cm);
-
- rw = new ResourceWatcher(cm);
-
- /* Watch plugins confuguration files */ /*
- rw.watchResource(Tools.getXmlCmPath(portalName));
- rw.watchResource(Tools.getXmlStatusPluginsCmPath(portalName));
- */
- /* Watch projects.xml file*/ /*
- rw.watchResource(Tools.getProjectsXmlPath(portalName));
- */
- /* Watch all project.xml files
- * We assume that they contain entries used by plugins */ /*
- Set<String> projectXmlPathsSet = Tools.getProjectXmlPathsSet(portalName);
-
- for (String projectXmlPath : projectXmlPathsSet) {
- rw.watchResource(projectXmlPath);
- }
-
- return desc;
- }*/
-
-
- /*
- public Object nodeUpdate(String portalName, Object currentValue) {
-
- if ((currentValue == null) || (rw.checkResources()) || (updateCounter == 499)) {
-
- updateCounter = 0;
- return getDesc(portalName);
- } else {
- ++updateCounter;
- return null;
- }
- }*/
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java 2006-04-24 19:53:02 UTC (rev 3953)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java 2006-04-24 21:46:17 UTC (rev 3954)
@@ -47,8 +47,6 @@
import org.jboss.forge.status.exceptions.ScoresSaveException;
import org.jboss.forge.status.service.model.PluginConf;
import org.jboss.forge.status.service.model.ScoresService;
-import org.jboss.forge.status.service.model.ScoresServiceLocal;
-import org.jboss.forge.status.service.model.ScoresServiceRemote;
import org.jboss.forge.status.tools.Plugins;
import org.jboss.forge.status.tools.Tools;
@@ -66,11 +64,11 @@
@Service(objectName=Tools.STATUS_SERVICE_NAME)
@Management(ScoresService.class)
-@Local(ScoresServiceLocal.class)
+@Local(ScoresService.class)
@LocalBinding(jndiBinding="Status/ScoresService")
-@Remote(ScoresServiceRemote.class)
+@Remote(ScoresService.class)
@RemoteBinding(jndiBinding="Status/RemoteScoresService")
-public class ScoresServiceImpl implements ScoresService, ScoresServiceLocal {
+public class ScoresServiceImpl implements ScoresService {
private static Logger log = Logger.getLogger(ScoresServiceImpl.class);
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/Columns.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/Columns.java 2006-04-24 19:53:02 UTC (rev 3953)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/Columns.java 2006-04-24 21:46:17 UTC (rev 3954)
@@ -34,8 +34,6 @@
import org.jboss.forge.common.projects.permissions.NullPermissionsChecker;
import org.jboss.forge.common.projects.permissions.PermissionsChecker;
-import org.jboss.forge.status.service.impl.PluginValuesImpl;
-import org.jboss.forge.status.service.impl.PluginsValuesImpl;
import org.jboss.forge.status.service.model.PluginValues;
import org.jboss.forge.status.service.model.PluginsValues;
import org.jboss.forge.status.tools.ProjectsByNameComparator;
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java 2006-04-24 19:53:02 UTC (rev 3953)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java 2006-04-24 21:46:17 UTC (rev 3954)
@@ -24,22 +24,20 @@
import java.util.Date;
import java.util.List;
+import java.util.Properties;
-import javax.management.MBeanServer;
-import javax.management.MalformedObjectNameException;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.rmi.PortableRemoteObject;
import org.jboss.forge.common.projects.Projects;
import org.jboss.forge.status.exceptions.GetScoresException;
import org.jboss.forge.status.exceptions.ScoresSaveException;
-import org.jboss.forge.status.service.model.ScoresServiceLocal;
import org.jboss.forge.status.service.model.PluginConf;
import org.jboss.forge.status.service.model.PluginsValues;
import org.jboss.forge.status.service.model.ScoresService;
-import org.jboss.forge.status.service.model.ScoresServiceRemote;
-import org.jboss.mx.util.MBeanProxyExt;
-import org.jboss.mx.util.MBeanServerLocator;
-
/**
* @author Pawel Wrzeszcz (pawel.wrzeszcz [at] gmail.com)
*/
@@ -47,48 +45,43 @@
public class ScoresManager {
private static String portalName;
+ private static boolean isRemote;
+ private static Properties properties;
public static void init(String portalName, ServiceConf serviceConf) {
+
ScoresManager.portalName = portalName;
- System.out.println("local: " + serviceConf.isLocal());
+
+ isRemote = serviceConf.isRemote();
+ System.out.println("local: " + isRemote);
+
+ properties = getRemoteServiceProperties();
}
-
+
public static void save(Projects projects, List<PluginConf> pluginsConf)
throws ScoresSaveException {
-
- MBeanServer server = MBeanServerLocator.locate();
+ ScoresService service = null;
+
+ try {
+ service = getService();
+ } catch (NamingException e) {
+ throw new ScoresSaveException(e);
+ }
- ScoresServiceRemote service;
- try {
- service = (ScoresServiceRemote) MBeanProxyExt.create(
- ScoresServiceRemote.class,
- Tools.STATUS_SERVICE_NAME,
- server);
- } catch (MalformedObjectNameException e) {
- throw new ScoresSaveException(e);
- }
+ service.save(projects, pluginsConf, portalName);
+ }
- service.save(projects, pluginsConf, portalName);
- }
-
public static PluginsValues getScores(Date date, Date toDate)
throws GetScoresException {
-
+
PluginsValues pluginsValues = null;
try {
- MBeanServer server = MBeanServerLocator.locate();
-
- ScoresService service = (ScoresService) MBeanProxyExt.create(
- ScoresService.class,
- Tools.STATUS_SERVICE_NAME,
- server);
-
+ ScoresService service = getService();
pluginsValues = service.getPluginsValues(portalName, date);
-
} catch (Exception e) {
- e.printStackTrace ();
+ throw new GetScoresException(e);
}
if (pluginsValues == null) {
@@ -126,4 +119,37 @@
return getScores(now, now);
}
+
+ private static ScoresService getService() throws NamingException {
+
+ Context context = new InitialContext(); //////////////////////// properties
+
+ // Perform look up using JNDI name of ejb object
+ Object ref = context.lookup("Status/RemoteScoresService");
+
+ // Narrow the reference of the object returned by lookup() method
+ ScoresService service =
+ (ScoresService)PortableRemoteObject.narrow( ref, ScoresService.class);
+ System.out.println("ScoresService " + service);
+
+ return service;
+ }
+
+ /*
+ * java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+ * java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
+ * java.naming.provider.url=localhost:1099
+ */
+
+ private static Properties getRemoteServiceProperties() {
+
+ Properties props = new Properties();
+
+ props.put(Context.INITIAL_CONTEXT_FACTORY,"org.jnp.interfaces.NamingContextFactory");
+ props.put(Context.URL_PKG_PREFIXES, "rg.jboss.naming:org.jnp.interfaces");
+ props.put(Context.PROVIDER_URL, "localhost:1099");
+ props.put("jnp.disableDiscovery", true);
+
+ return properties;
+ }
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ServiceConf.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ServiceConf.java 2006-04-24 19:53:02 UTC (rev 3953)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ServiceConf.java 2006-04-24 21:46:17 UTC (rev 3954)
@@ -46,7 +46,7 @@
}
- public boolean isLocal() {
- return !remoteService;
+ public boolean isRemote() {
+ return remoteService;
}
}
\ No newline at end of file
|
|
From: <jbo...@li...> - 2006-04-24 19:53:12
|
Author: mar...@jb... Date: 2006-04-24 15:53:02 -0400 (Mon, 24 Apr 2006) New Revision: 3953 Removed: labs/jbossrules/trunk/repository/jsr94/ Log: -these are now on jboss maven2 repository |
|
From: <jbo...@li...> - 2006-04-24 19:51:11
|
Author: mar...@jb...
Date: 2006-04-24 15:51:04 -0400 (Mon, 24 Apr 2006)
New Revision: 3952
Modified:
labs/jbossrules/trunk/pom.xml
Log:
-added the jboss maven2 repository
Modified: labs/jbossrules/trunk/pom.xml
===================================================================
--- labs/jbossrules/trunk/pom.xml 2006-04-24 18:12:13 UTC (rev 3951)
+++ labs/jbossrules/trunk/pom.xml 2006-04-24 19:51:04 UTC (rev 3952)
@@ -207,6 +207,11 @@
<id>ibiblio</id>
<url>http://www.ibiblio.org/maven2/</url>
</repository>
+
+ <repository>
+ <id>jboss</id>
+ <url>http://repository.jboss.com/maven2/</url>
+ </repository>
<repository>
<id>basedir</id>
|
|
From: <jbo...@li...> - 2006-04-24 15:05:42
|
Author: arvinder
Date: 2006-04-24 11:05:37 -0400 (Mon, 24 Apr 2006)
New Revision: 3950
Modified:
labs/jbossesb/branches/JBESB-13/build.xml
Log:
Added test target
Modified: labs/jbossesb/branches/JBESB-13/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB-13/build.xml 2006-04-24 15:03:17 UTC (rev 3949)
+++ labs/jbossesb/branches/JBESB-13/build.xml 2006-04-24 15:05:37 UTC (rev 3950)
@@ -342,4 +342,14 @@
<target name="jar" depends="org.jboss.esb.jar"/>
<target name="sar" depends="org.jboss.esb.sar"/>
<target name="clean" depends="org.jboss.esb.clean"/>
+
+
+ <!--
+ Call the QA/Tests
+ -->
+ <target name="test">
+ <echo message="Running QA Tests"/>
+ <ant dir="QA" target="test"/>
+ </target>
+
</project>
|
|
From: <jbo...@li...> - 2006-04-24 15:03:25
|
Author: arvinder
Date: 2006-04-24 11:03:17 -0400 (Mon, 24 Apr 2006)
New Revision: 3949
Added:
labs/jbossesb/branches/JBESB-13/QA/
labs/jbossesb/branches/JBESB-13/QA/build.xml
labs/jbossesb/branches/JBESB-13/QA/etc/
labs/jbossesb/branches/JBESB-13/QA/src/
labs/jbossesb/branches/JBESB-13/QA/src/org/
labs/jbossesb/branches/JBESB-13/QA/src/org/jboss/
labs/jbossesb/branches/JBESB-13/QA/src/org/jboss/soa/
labs/jbossesb/branches/JBESB-13/QA/src/org/jboss/soa/esbcore/
labs/jbossesb/branches/JBESB-13/QA/src/org/jboss/soa/esbcore/deploy/
labs/jbossesb/branches/JBESB-13/QA/src/org/jboss/soa/esbcore/deploy/bootstrap/
labs/jbossesb/branches/JBESB-13/QA/src/org/jboss/soa/esbcore/deploy/bootstrap/container/
labs/jbossesb/branches/JBESB-13/QA/src/org/jboss/soa/esbcore/deploy/bootstrap/container/JBossESBKernelTest.java
Log:
Initial entry
Added: labs/jbossesb/branches/JBESB-13/QA/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB-13/QA/build.xml 2006-04-24 14:43:33 UTC (rev 3948)
+++ labs/jbossesb/branches/JBESB-13/QA/build.xml 2006-04-24 15:03:17 UTC (rev 3949)
@@ -0,0 +1,81 @@
+<project name="JBESB-TEST" default="test" basedir=".">
+
+
+ <!-- Set internal property defaults -->
+ <property environment="env"/>
+
+ <!-- Path names -->
+ <property name="org.jboss.esb.internal.test.src" value="src"/>
+ <property name="org.jboss.esb.internal.test.etc" value="etc"/>
+ <property name="org.jboss.esb.internal.test.dest.root" value="../build/tests"/>
+ <property name="org.jboss.esb.internal.test.dest" value="${org.jboss.esb.internal.test.dest.root}/classes"/>
+ <property name="org.jboss.esb.internal.test.reports" value="${org.jboss.esb.internal.test.dest.root}/reports"/>
+
+
+ <!-- compile deps -->
+ <path id="compile.classpath">
+ <fileset dir="../lib">
+ <include name="**/**/*.jar"/>
+ </fileset>
+ </path>
+
+ <!-- Clean the test outputs -->
+ <target name="org.jboss.esb.internal.test.clean">
+ <echo message="Cleaning tests module"/>
+ <delete dir="${org.jboss.esb.internal.test.dest.root}"/>
+ </target>
+
+ <!-- Prepare directories -->
+ <target name="org.jboss.esb.internal.test.prepare" depends="org.jboss.esb.internal.test.clean">
+ <mkdir dir="${org.jboss.esb.internal.test.dest}"/>
+ <mkdir dir="${org.jboss.esb.internal.test.reports}"/>
+ </target>
+
+ <!-- Compilation targets -->
+ <target name="org.jboss.esb.test.compile"
+ depends="org.jboss.esb.internal.test.compile"/>
+
+ <target name="org.jboss.esb.internal.test.compile" depends="org.jboss.esb.internal.test.prepare">
+ <echo message="Compiling tests for module"/>
+ <javac srcdir="${org.jboss.esb.internal.test.src}"
+ destdir="${org.jboss.esb.internal.test.dest}"
+ debug="yes"
+ >
+ <classpath refid="compile.classpath"/>
+ </javac>
+
+ </target>
+
+ <!-- Test target -->
+ <target name="org.jboss.esb.internal.test" depends="org.jboss.esb.internal.test.compile">
+ <echo message="Running tests for module"/>
+ <junit printsummary="yes" haltonerror="yes" haltonfailure="yes" showoutput="no" fork="true">
+ <formatter type="plain" usefile="false"/>
+ <formatter type="xml"/>
+ <batchtest todir="${org.jboss.esb.internal.test.reports}">
+ <fileset dir="${org.jboss.esb.internal.test.dest}">
+ <include name="**/**/**Test.class"/>
+ </fileset>
+ </batchtest>
+ <classpath>
+ <path refid="compile.classpath"/>
+ <pathelement location="${org.jboss.esb.internal.test.dest}"/>
+ <pathelement location="${org.jboss.esb.internal.test.etc}"/>
+ </classpath>
+ </junit>
+ <junitreport>
+ <fileset dir="${org.jboss.esb.internal.test.reports}">
+ <include name="*.xml"/>
+ </fileset>
+ <report format="frames" todir="${org.jboss.esb.internal.test.reports}"/>
+ <report format="noframes" todir="${org.jboss.esb.internal.test.reports}"/>
+ </junitreport>
+ </target>
+
+
+ <!-- Short target names -->
+ <target name="compile" depends="org.jboss.esb.test.compile"/>
+ <target name="test" depends="org.jboss.esb.internal.test"/>
+ <target name="clean" depends="org.jboss.esb.internal.test.clean"/>
+
+</project>
Added: labs/jbossesb/branches/JBESB-13/QA/src/org/jboss/soa/esbcore/deploy/bootstrap/container/JBossESBKernelTest.java
===================================================================
--- labs/jbossesb/branches/JBESB-13/QA/src/org/jboss/soa/esbcore/deploy/bootstrap/container/JBossESBKernelTest.java 2006-04-24 14:43:33 UTC (rev 3948)
+++ labs/jbossesb/branches/JBESB-13/QA/src/org/jboss/soa/esbcore/deploy/bootstrap/container/JBossESBKernelTest.java 2006-04-24 15:03:17 UTC (rev 3949)
@@ -0,0 +1,55 @@
+package org.jboss.soa.esbcore.deploy.bootstrap.container;
+
+import junit.framework.TestCase;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import org.jboss.logging.Logger;
+
+
+public class JBossESBKernelTest extends TestCase {
+
+ protected Logger log = Logger.getLogger(getClass());
+
+ public JBossESBKernelTest(String name) {
+ super(name);
+ }
+
+ public static Test suite() {
+ return new TestSuite(JBossESBKernelTest.class);
+ }
+
+ protected void setUp() throws Exception {
+ }
+
+ protected void tearDown() throws Exception {
+ }
+
+ public void testBasicStartup() throws Exception {
+ log.info("Testing basic start startup with defaults");
+ JBossESBKernel esbkernel = new JBossESBKernel();
+ try {
+ esbkernel.bootstrap();
+ }
+ catch (Throwable e) {
+ fail(e.getMessage());
+ }
+ }
+
+ /*
+ public void testStartupWithCustomConfiguration() throws Exception
+ {
+ log.info("Testing custom service configuration start up");
+ String[] args = {"-c test-jboss-esb-core.xml"};
+ JBossESBKernel esbkernel = new JBossESBKernel(args);
+ try
+ {
+ esbkernel.bootstrap();
+ }
+ catch (Throwable e)
+ {
+ fail(e.getMessage());
+ }
+ }
+ */
+
+}
|
|
From: <jbo...@li...> - 2006-04-24 14:43:43
|
Author: arvinder
Date: 2006-04-24 10:43:33 -0400 (Mon, 24 Apr 2006)
New Revision: 3948
Removed:
labs/jbossesb/branches/JBESB-13/ESBCore/tests/
Modified:
labs/jbossesb/branches/JBESB-13/ESBCore/classes/org/jboss/soa/esbcore/deploy/bootstrap/container/JBossESBKernel.java
Log:
Removed test dir
Modified: labs/jbossesb/branches/JBESB-13/ESBCore/classes/org/jboss/soa/esbcore/deploy/bootstrap/container/JBossESBKernel.java
===================================================================
--- labs/jbossesb/branches/JBESB-13/ESBCore/classes/org/jboss/soa/esbcore/deploy/bootstrap/container/JBossESBKernel.java 2006-04-24 14:15:34 UTC (rev 3947)
+++ labs/jbossesb/branches/JBESB-13/ESBCore/classes/org/jboss/soa/esbcore/deploy/bootstrap/container/JBossESBKernel.java 2006-04-24 14:43:33 UTC (rev 3948)
@@ -23,6 +23,7 @@
import org.jboss.kernel.plugins.bootstrap.basic.BasicBootstrap;
import org.jboss.kernel.spi.deployment.KernelDeployment;
import org.jboss.util.CollectionsFactory;
+import org.jboss.logging.Logger;
import java.util.List;
import java.util.Enumeration;
@@ -41,6 +42,10 @@
*/
public class JBossESBKernel extends BasicBootstrap
{
+
+ /** Logger **/
+ protected Logger log = Logger.getLogger(getClass());
+
/** The deployer */
protected BeanXMLDeployer deployer;
@@ -118,8 +123,7 @@
*/
private void processCommandLine(final String[] args) throws Exception
{
- // override default start properties
-
+ //@todo override default start properties from the command line.
}
/**
|
|
From: <jbo...@li...> - 2006-04-24 14:15:43
|
Author: wrzep Date: 2006-04-24 10:15:34 -0400 (Mon, 24 Apr 2006) New Revision: 3947 Added: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusConfWatcher.java labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/model/ScoresServiceRemote.java Removed: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusNodeWatcher.java Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tools.java Log: JBLAB-599 ShotokuResourceWatcher instead of deprecated NodeWatcher Pawel Added: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusConfWatcher.java =================================================================== --- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusConfWatcher.java 2006-04-24 14:13:06 UTC (rev 3946) +++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusConfWatcher.java 2006-04-24 14:15:34 UTC (rev 3947) @@ -0,0 +1,103 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.forge.status; + +import java.util.Map; +import java.util.Set; + +import org.jboss.forge.status.tools.Tools; + +import org.jboss.shotoku.cache.ChangeType; +import org.jboss.shotoku.cache.ShotokuResourceWatcher; + +public class StatusConfWatcher extends ShotokuResourceWatcher<String, StatusDescriptor> { + + private StatusDescriptor getDesc(String portalName) { + return new StatusDescriptor(portalName, getContentManager(portalName)); + } + + @Override + public StatusDescriptor init(String key) { + + String portalName = key; + + addWatchedPath(key, Tools.getXmlCmPath(portalName)); + addWatchedPath(key, Tools.getXmlStatusPluginsCmPath(portalName)); + addWatchedPath(key, Tools.getXmlServiceCmPath(portalName)); + + /* Watch projects.xml file */ + addWatchedPath(key, Tools.getProjectsXmlPath(portalName)); + + /* Watch all project.xml files. + * We assume that they contain entries used by plugins */ + Set<String> projectXmlPathsSet = Tools.getProjectXmlPathsSet(portalName); + + for (String projectXmlPath : projectXmlPathsSet) { + addWatchedPath(key, projectXmlPath); + } + + return getDesc(portalName); + } + + @Override + protected void update(String key, StatusDescriptor currentObject, Map<String, ChangeType> changes) { + put(key, getDesc(key)); + } + + /* + + StatusDescriptor desc = new StatusDescriptor(portalName, cm); + + rw = new ResourceWatcher(cm); + + /* Watch plugins confuguration files */ /* + rw.watchResource(Tools.getXmlCmPath(portalName)); + rw.watchResource(Tools.getXmlStatusPluginsCmPath(portalName)); + */ + /* Watch projects.xml file*/ /* + rw.watchResource(Tools.getProjectsXmlPath(portalName)); + */ + /* Watch all project.xml files + * We assume that they contain entries used by plugins */ /* + Set<String> projectXmlPathsSet = Tools.getProjectXmlPathsSet(portalName); + + for (String projectXmlPath : projectXmlPathsSet) { + rw.watchResource(projectXmlPath); + } + + return desc; + }*/ + + + /* + public Object nodeUpdate(String portalName, Object currentValue) { + + if ((currentValue == null) || (rw.checkResources()) || (updateCounter == 499)) { + + updateCounter = 0; + return getDesc(portalName); + } else { + ++updateCounter; + return null; + } + }*/ +} Deleted: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusNodeWatcher.java =================================================================== --- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusNodeWatcher.java 2006-04-24 14:13:06 UTC (rev 3946) +++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusNodeWatcher.java 2006-04-24 14:15:34 UTC (rev 3947) @@ -1,83 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.forge.status; - -import java.util.Set; - -import org.jboss.forge.common.service.NodeWatcher; -import org.jboss.forge.common.service.ResourceWatcher; -import org.jboss.forge.status.tools.Tools; - -import org.jboss.shotoku.ContentManager; - -public class StatusNodeWatcher implements NodeWatcher { - - private ResourceWatcher rw; - private ContentManager cm; - - private int updateCounter; - - public StatusNodeWatcher(ContentManager cm) { - this.cm = cm; - updateCounter = 0; - } - - private StatusDescriptor getDesc(String portalName) { - - StatusDescriptor desc = new StatusDescriptor(portalName, cm); - - rw = new ResourceWatcher(cm); - - /* Watch plugins confuguration files */ - rw.watchResource(Tools.getXmlCmPath(portalName)); - rw.watchResource(Tools.getXmlStatusPluginsCmPath(portalName)); - - /* Watch projects.xml file*/ - rw.watchResource(Tools.getProjectsXmlPath(portalName)); - - /* Watch all project.xml files - * We assume that they contain entries used by plugins */ - Set<String> projectXmlPathsSet = Tools.getProjectXmlPathsSet(portalName); - - for (String projectXmlPath : projectXmlPathsSet) { - rw.watchResource(projectXmlPath); - } - - return desc; - } - - public Object init(String portalName) { - return getDesc(portalName); - } - - public Object nodeUpdate(String portalName, Object currentValue) { - - if ((currentValue == null) || (rw.checkResources()) || (updateCounter == 499)) { - - updateCounter = 0; - return getDesc(portalName); - } else { - ++updateCounter; - return null; - } - } -} Added: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/model/ScoresServiceRemote.java =================================================================== --- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/model/ScoresServiceRemote.java 2006-04-24 14:13:06 UTC (rev 3946) +++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/model/ScoresServiceRemote.java 2006-04-24 14:15:34 UTC (rev 3947) @@ -0,0 +1,45 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.jboss.forge.status.service.model; + +import java.util.Date; +import java.util.List; + +import org.jboss.forge.common.projects.Projects; +import org.jboss.forge.status.exceptions.GetScoresException; +import org.jboss.forge.status.exceptions.ScoresSaveException; + +/** +* @author Pawel Wrzeszcz (pawel.wrzeszcz [at] gmail.com) +*/ +public interface ScoresServiceRemote { + + public PluginsValues getPluginsValues(String portalName, + Date date) throws GetScoresException; + + public void save(Projects projects, List<PluginConf> pluginsConf, + String portalName) throws ScoresSaveException; + + public PluginValues get(String portalName, String pluginId, Date date) + throws GetScoresException; +} \ No newline at end of file Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java =================================================================== --- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java 2006-04-24 14:13:06 UTC (rev 3946) +++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java 2006-04-24 14:15:34 UTC (rev 3947) @@ -35,6 +35,7 @@ import org.jboss.forge.status.service.model.PluginConf; import org.jboss.forge.status.service.model.PluginsValues; import org.jboss.forge.status.service.model.ScoresService; +import org.jboss.forge.status.service.model.ScoresServiceRemote; import org.jboss.mx.util.MBeanProxyExt; import org.jboss.mx.util.MBeanServerLocator; @@ -58,10 +59,10 @@ MBeanServer server = MBeanServerLocator.locate(); - ScoresServiceLocal service; + ScoresServiceRemote service; try { - service = (ScoresServiceLocal) MBeanProxyExt.create( - ScoresServiceLocal.class, + service = (ScoresServiceRemote) MBeanProxyExt.create( + ScoresServiceRemote.class, Tools.STATUS_SERVICE_NAME, server); } catch (MalformedObjectNameException e) { @@ -69,7 +70,6 @@ } service.save(projects, pluginsConf, portalName); - } public static PluginsValues getScores(Date date, Date toDate) Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tools.java =================================================================== --- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tools.java 2006-04-24 14:13:06 UTC (rev 3946) +++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tools.java 2006-04-24 14:15:34 UTC (rev 3947) @@ -9,10 +9,9 @@ import org.jboss.forge.common.projects.permissions.NullPermissionsChecker; import org.jboss.forge.common.projects.permissions.PermissionsChecker; import org.jboss.forge.status.StatusDescriptor; -import org.jboss.forge.status.StatusNodeWatcher; +import org.jboss.forge.status.StatusConfWatcher; -import org.jboss.shotoku.ContentManager; -import org.jboss.shotoku.aop.Inject; +import org.jboss.shotoku.aop.CacheItem; /** * Common constants and functions. @@ -38,22 +37,11 @@ public static final String STATUS_SERVICE_NAME = "status:service=scores"; - @Inject - private static ContentManager cm; + @CacheItem + private static StatusConfWatcher conf; public static synchronized StatusDescriptor getDesc(final String portalName) { - String cacheKey = StatusDescriptor.class.getName(); - - StatusDescriptor desc = (StatusDescriptor) ForgeHelper - .getForgeManagement().getFromCache(portalName, cacheKey); - - if (desc == null) - desc = (StatusDescriptor) ForgeHelper.getForgeManagement() - .addNodeWatcher(portalName, - cacheKey, - new StatusNodeWatcher(cm)); - - return desc; + return conf.get(portalName); } /** |
|
From: <jbo...@li...> - 2006-04-24 14:13:15
|
Author: arvinder Date: 2006-04-24 10:13:06 -0400 (Mon, 24 Apr 2006) New Revision: 3946 Added: labs/jbossesb/branches/JBESB-13/lib/ext/junit.jar Log: Initial entry Added: labs/jbossesb/branches/JBESB-13/lib/ext/junit.jar =================================================================== (Binary files differ) Property changes on: labs/jbossesb/branches/JBESB-13/lib/ext/junit.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream |
|
From: <jbo...@li...> - 2006-04-24 14:12:16
|
Author: arvinder
Date: 2006-04-24 10:12:03 -0400 (Mon, 24 Apr 2006)
New Revision: 3945
Added:
labs/jbossesb/branches/JBESB-13/ESBCore/tests/
labs/jbossesb/branches/JBESB-13/ESBCore/tests/build.xml
labs/jbossesb/branches/JBESB-13/ESBCore/tests/etc/
labs/jbossesb/branches/JBESB-13/ESBCore/tests/src/
labs/jbossesb/branches/JBESB-13/ESBCore/tests/src/org/
labs/jbossesb/branches/JBESB-13/ESBCore/tests/src/org/jboss/
labs/jbossesb/branches/JBESB-13/ESBCore/tests/src/org/jboss/soa/
labs/jbossesb/branches/JBESB-13/ESBCore/tests/src/org/jboss/soa/esbcore/
labs/jbossesb/branches/JBESB-13/ESBCore/tests/src/org/jboss/soa/esbcore/deploy/
labs/jbossesb/branches/JBESB-13/ESBCore/tests/src/org/jboss/soa/esbcore/deploy/bootstrap/
labs/jbossesb/branches/JBESB-13/ESBCore/tests/src/org/jboss/soa/esbcore/deploy/bootstrap/container/
labs/jbossesb/branches/JBESB-13/ESBCore/tests/src/org/jboss/soa/esbcore/deploy/bootstrap/container/JBossESBKernelTest.java
Log:
Initial entry
Added: labs/jbossesb/branches/JBESB-13/ESBCore/tests/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB-13/ESBCore/tests/build.xml 2006-04-24 12:19:01 UTC (rev 3944)
+++ labs/jbossesb/branches/JBESB-13/ESBCore/tests/build.xml 2006-04-24 14:12:03 UTC (rev 3945)
@@ -0,0 +1,81 @@
+<project name="JBESB-TEST" default="test" basedir=".">
+
+
+ <!-- Set internal property defaults -->
+ <property environment="env"/>
+
+ <!-- Path names -->
+ <property name="org.jboss.esb.internal.test.src" value="src"/>
+ <property name="org.jboss.esb.internal.test.etc" value="etc"/>
+ <property name="org.jboss.esb.internal.test.dest.root" value="../../build/tests"/>
+ <property name="org.jboss.esb.internal.test.dest" value="${org.jboss.esb.internal.test.dest.root}/classes"/>
+ <property name="org.jboss.esb.internal.test.reports" value="${org.jboss.esb.internal.test.dest.root}/reports"/>
+
+
+ <!-- compile deps -->
+ <path id="compile.classpath">
+ <fileset dir="../../lib">
+ <include name="**/**/*.jar"/>
+ </fileset>
+ </path>
+
+ <!-- Clean the test outputs -->
+ <target name="org.jboss.esb.internal.test.clean">
+ <echo message="Cleaning tests module"/>
+ <delete dir="${org.jboss.esb.internal.test.dest.root}"/>
+ </target>
+
+ <!-- Prepare directories -->
+ <target name="org.jboss.esb.internal.test.prepare" depends="org.jboss.esb.internal.test.clean">
+ <mkdir dir="${org.jboss.esb.internal.test.dest}"/>
+ <mkdir dir="${org.jboss.esb.internal.test.reports}"/>
+ </target>
+
+ <!-- Compilation targets -->
+ <target name="org.jboss.esb.test.compile"
+ depends="org.jboss.esb.internal.test.compile"/>
+
+ <target name="org.jboss.esb.internal.test.compile" depends="org.jboss.esb.internal.test.prepare">
+ <echo message="Compiling tests for module"/>
+ <javac srcdir="${org.jboss.esb.internal.test.src}"
+ destdir="${org.jboss.esb.internal.test.dest}"
+ debug="yes"
+ >
+ <classpath refid="compile.classpath"/>
+ </javac>
+
+ </target>
+
+
+ <target name="org.jboss.esb.internal.test" depends="org.jboss.esb.internal.test.compile">
+ <echo message="Running tests for module"/>
+ <junit printsummary="yes" haltonerror="yes" haltonfailure="yes" showoutput="no" fork="true">
+ <formatter type="plain" usefile="false"/>
+ <formatter type="xml"/>
+ <batchtest todir="${org.jboss.esb.internal.test.reports}">
+ <fileset dir="${org.jboss.esb.internal.test.dest}">
+ <include name="**/**/**Test.class"/>
+ </fileset>
+ </batchtest>
+ <classpath>
+ <path refid="compile.classpath"/>
+ <pathelement location="${org.jboss.esb.internal.test.dest}"/>
+ <pathelement location="${org.jboss.esb.internal.test.etc}"/>
+ </classpath>
+ </junit>
+ <junitreport>
+ <fileset dir="${org.jboss.esb.internal.test.reports}">
+ <include name="*.xml"/>
+ </fileset>
+ <report format="frames" todir="${org.jboss.esb.internal.test.reports}"/>
+ <report format="noframes" todir="${org.jboss.esb.internal.test.reports}"/>
+ </junitreport>
+ </target>
+
+
+ <!-- Short target names -->
+ <target name="compile" depends="org.jboss.esb.test.compile"/>
+ <target name="test" depends="org.jboss.esb.internal.test"/>
+ <target name="clean" depends="org.jboss.esb.internal.test.clean"/>
+
+</project>
Added: labs/jbossesb/branches/JBESB-13/ESBCore/tests/src/org/jboss/soa/esbcore/deploy/bootstrap/container/JBossESBKernelTest.java
===================================================================
--- labs/jbossesb/branches/JBESB-13/ESBCore/tests/src/org/jboss/soa/esbcore/deploy/bootstrap/container/JBossESBKernelTest.java 2006-04-24 12:19:01 UTC (rev 3944)
+++ labs/jbossesb/branches/JBESB-13/ESBCore/tests/src/org/jboss/soa/esbcore/deploy/bootstrap/container/JBossESBKernelTest.java 2006-04-24 14:12:03 UTC (rev 3945)
@@ -0,0 +1,55 @@
+package org.jboss.soa.esbcore.deploy.bootstrap.container;
+
+import junit.framework.TestCase;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import org.jboss.logging.Logger;
+
+
+public class JBossESBKernelTest extends TestCase {
+
+ protected Logger log = Logger.getLogger(getClass());
+
+ public JBossESBKernelTest(String name) {
+ super(name);
+ }
+
+ public static Test suite() {
+ return new TestSuite(JBossESBKernelTest.class);
+ }
+
+ protected void setUp() throws Exception {
+ }
+
+ protected void tearDown() throws Exception {
+ }
+
+ public void testBasicStartup() throws Exception {
+ log.info("Testing basic start startup with defaults");
+ JBossESBKernel esbkernel = new JBossESBKernel();
+ try {
+ esbkernel.bootstrap();
+ }
+ catch (Throwable e) {
+ fail(e.getMessage());
+ }
+ }
+
+ /*
+ public void testStartupWithCustomConfiguration() throws Exception
+ {
+ log.info("Testing custom service configuration start up");
+ String[] args = {"-c test-jboss-esb-core.xml"};
+ JBossESBKernel esbkernel = new JBossESBKernel(args);
+ try
+ {
+ esbkernel.bootstrap();
+ }
+ catch (Throwable e)
+ {
+ fail(e.getMessage());
+ }
+ }
+ */
+
+}
|
|
From: <jbo...@li...> - 2006-04-24 12:19:11
|
Author: wrzep Date: 2006-04-24 08:19:01 -0400 (Mon, 24 Apr 2006) New Revision: 3944 Added: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ServiceConf.java Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/Last7DaysStatusPlugin.java labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/PluginValuesImpl.java labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/PluginsValuesImpl.java labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/model/PluginConf.java labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/model/PluginValues.java labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/model/PluginsValues.java labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tags.java labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tools.java Log: JBLAB-599 Pawel Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java =================================================================== --- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java 2006-04-24 11:00:44 UTC (rev 3943) +++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java 2006-04-24 12:19:01 UTC (rev 3944) @@ -46,6 +46,7 @@ import org.jboss.forge.status.templates.Columns; import org.jboss.forge.status.templates.MatrixTemplate; import org.jboss.forge.status.tools.ScoresManager; +import org.jboss.forge.status.tools.ServiceConf; import org.jboss.forge.status.tools.Tags; import org.jboss.logging.Logger; @@ -55,7 +56,7 @@ import org.w3c.dom.NodeList; /** -* @author Pawel Wrzeszcz (paw...@gm...) +* @author Pawel Wrzeszcz (pawel.wrzeszcz [at] gmail.com) * A class which handles Status Matrix information managment. */ public class Status { @@ -76,30 +77,30 @@ * @param statusRoot Node with Matrix properites * @param pluginsRoot Node defining Plugins used in the Matrix */ - public Status(String portalName, Node statusRoot, Node pluginsRoot) { + public Status(String portalName, Node statusRoot, Node pluginsRoot, + Node serviceRoot) { log = Logger.getLogger(this.getClass()); - // Get projects + // Get configuration projects = ProjectsHelper.getProjects(portalName); + List<PluginConf> pluginsConf = getPluginsConfList(pluginsRoot); + ServiceConf serviceConf = new ServiceConf(serviceRoot); + + ScoresManager.init(portalName, serviceConf); - // Get plugins configuration - List<PluginConf> pluginsConf = getPluginsConfList(pluginsRoot); - PluginsValues pluginsValues; - try { - ScoresManager scoresManager = new ScoresManager(portalName); // Compute and save current scores - scoresManager.save(projects, pluginsConf); + ScoresManager.save(projects, pluginsConf); // <debug>; - long v = scoresManager.getValue("downloads", "jbosswiki", new Date(), new Date()); + long v = ScoresManager.getValue("downloads", "jbosswiki", new Date(), new Date()); System.out.println("value = " + v); // </debug> - pluginsValues = scoresManager.getCurrentScores(); + pluginsValues = ScoresManager.getCurrentScores(); } catch (ScoresSaveException e) { log.error("Saving scores failed ", e); Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java =================================================================== --- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java 2006-04-24 11:00:44 UTC (rev 3943) +++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java 2006-04-24 12:19:01 UTC (rev 3944) @@ -59,8 +59,12 @@ String pluginsPath = Tools.getXmlStatusPluginsCmPath(portalName); Node pluginsRoot = getRoot(cm, pluginsPath); - status = new Status(portalName, statusRoot, pluginsRoot); + String servicePath = Tools.getXmlServiceCmPath(portalName); + Node serviceRoot = getRoot(cm, servicePath); + status = new Status(portalName, statusRoot, pluginsRoot, + serviceRoot); + fillContext(); } catch (Exception e) { Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/Last7DaysStatusPlugin.java =================================================================== --- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/Last7DaysStatusPlugin.java 2006-04-24 11:00:44 UTC (rev 3943) +++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/Last7DaysStatusPlugin.java 2006-04-24 12:19:01 UTC (rev 3944) @@ -41,8 +41,6 @@ Plugin insidePlugin; - ScoresManager scoresManager; - @Override public void init(String id, String portalName, Projects projects, Plugins plugins, Properties properties) @@ -66,8 +64,6 @@ "Plugin " + insidePluginId + " not found."); } - scoresManager = new ScoresManager(portalName); - super.init(id, portalName, projects, plugins, properties); } @@ -83,7 +79,7 @@ Date prev = cal.getTime(); try { - prevValue = scoresManager.getValue( + prevValue = ScoresManager.getValue( insidePlugin.getId(), projectId, prev,now); } catch (GetScoresException e) { return 0; Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/PluginValuesImpl.java =================================================================== --- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/PluginValuesImpl.java 2006-04-24 11:00:44 UTC (rev 3943) +++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/PluginValuesImpl.java 2006-04-24 12:19:01 UTC (rev 3944) @@ -30,7 +30,7 @@ import org.jboss.forge.status.service.model.PluginValues; /** -* @author Pawel Wrzeszcz (paw...@gm...) +* @author Pawel Wrzeszcz (pawel.wrzeszcz [at] gmail.com) * A class used to store plugin values in shotoku. */ Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/PluginsValuesImpl.java =================================================================== --- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/PluginsValuesImpl.java 2006-04-24 11:00:44 UTC (rev 3943) +++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/PluginsValuesImpl.java 2006-04-24 12:19:01 UTC (rev 3944) @@ -28,8 +28,6 @@ import java.util.HashMap; import java.util.Set; -import java.io.Serializable; - import org.jboss.forge.common.projects.Projects; import org.jboss.forge.common.projects.permissions.NullPermissionsChecker; @@ -39,7 +37,7 @@ import org.jboss.forge.status.tools.Plugins; /** -* @author Pawel Wrzeszcz (paw...@gm...) +* @author Pawel Wrzeszcz (pawel.wrzeszcz [at] gmail.com) * A class used to store plugins values in shotoku. */ Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java =================================================================== --- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java 2006-04-24 11:00:44 UTC (rev 3943) +++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java 2006-04-24 12:19:01 UTC (rev 3944) @@ -22,7 +22,6 @@ package org.jboss.forge.status.service.impl; -import java.io.IOException; import java.io.InputStream; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; @@ -35,9 +34,11 @@ import java.util.Map; import javax.ejb.Local; +import javax.ejb.Remote; import org.jboss.annotation.ejb.LocalBinding; import org.jboss.annotation.ejb.Management; +import org.jboss.annotation.ejb.RemoteBinding; import org.jboss.annotation.ejb.Service; import org.jboss.forge.common.projects.Projects; @@ -47,6 +48,7 @@ import org.jboss.forge.status.service.model.PluginConf; import org.jboss.forge.status.service.model.ScoresService; import org.jboss.forge.status.service.model.ScoresServiceLocal; +import org.jboss.forge.status.service.model.ScoresServiceRemote; import org.jboss.forge.status.tools.Plugins; import org.jboss.forge.status.tools.Tools; @@ -57,16 +59,17 @@ import org.jboss.shotoku.aop.Inject; import org.jboss.shotoku.exceptions.RepositoryException; import org.jboss.shotoku.exceptions.ResourceDoesNotExist; -import org.jboss.shotoku.exceptions.SaveException; /** -* @author Pawel Wrzeszcz (paw...@gm...) +* @author Pawel Wrzeszcz (pawel.wrzeszcz [at] gmail.com) */ @Service(objectName=Tools.STATUS_SERVICE_NAME) @Management(ScoresService.class) @Local(ScoresServiceLocal.class) @LocalBinding(jndiBinding="Status/ScoresService") +@Remote(ScoresServiceRemote.class) +@RemoteBinding(jndiBinding="Status/RemoteScoresService") public class ScoresServiceImpl implements ScoresService, ScoresServiceLocal { private static Logger log = Logger.getLogger(ScoresServiceImpl.class); @@ -122,9 +125,10 @@ * * @param dir Directory to save values * @param pluginsValues PluginsValues to save - * @return true iff saving was successful + * @throws ScoresSaveException */ - private boolean save(Node node, PluginsValuesImpl pluginsValues) { + private void save(Node node, PluginsValuesImpl pluginsValues) + throws ScoresSaveException { try { OutputStream os = node.getOutputStream(); @@ -132,18 +136,11 @@ oos.writeObject((PluginsValuesImpl) pluginsValues); oos.close(); node.save("update"); /* os is closed inside save() */ - } catch (IOException e) { - e.printStackTrace();//TODO error messages - return false; - } catch (RepositoryException e) { - e.printStackTrace(); - return false; - } catch (SaveException e) { - e.printStackTrace(); - return false; + } catch (Exception e) { + log.error("Error while saving shotoku node: " + + node.getFullName(), e); + throw new ScoresSaveException(e); } - - return true; } /** Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/model/PluginConf.java =================================================================== --- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/model/PluginConf.java 2006-04-24 11:00:44 UTC (rev 3943) +++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/model/PluginConf.java 2006-04-24 12:19:01 UTC (rev 3944) @@ -30,8 +30,6 @@ */ public interface PluginConf extends Serializable { - //TODO PluginConfImpl has constructor - public String getFieldValue(String fieldName); public Properties getProperties(); Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/model/PluginValues.java =================================================================== --- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/model/PluginValues.java 2006-04-24 11:00:44 UTC (rev 3943) +++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/model/PluginValues.java 2006-04-24 12:19:01 UTC (rev 3944) @@ -25,7 +25,7 @@ import java.io.Serializable; /** -* @author Pawel Wrzeszcz (paw...@gm...) +* @author Pawel Wrzeszcz (pawel.wrzeszcz [at] gmail.com) * A class used to store plugin values in shotoku. */ Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/model/PluginsValues.java =================================================================== --- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/model/PluginsValues.java 2006-04-24 11:00:44 UTC (rev 3943) +++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/model/PluginsValues.java 2006-04-24 12:19:01 UTC (rev 3944) @@ -30,15 +30,12 @@ /** -* @author Pawel Wrzeszcz (paw...@gm...) +* @author Pawel Wrzeszcz (pawel.wrzeszcz [at] gmail.com) * A class used to store plugins values in shotoku. */ public interface PluginsValues extends Serializable { - - //TODO constructor in impl - /** * For the given plugin and project ids returns stored value. * Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java =================================================================== --- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java 2006-04-24 11:00:44 UTC (rev 3943) +++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java 2006-04-24 12:19:01 UTC (rev 3944) @@ -31,6 +31,7 @@ import org.jboss.forge.common.projects.Projects; import org.jboss.forge.status.exceptions.GetScoresException; import org.jboss.forge.status.exceptions.ScoresSaveException; +import org.jboss.forge.status.service.model.ScoresServiceLocal; import org.jboss.forge.status.service.model.PluginConf; import org.jboss.forge.status.service.model.PluginsValues; import org.jboss.forge.status.service.model.ScoresService; @@ -39,27 +40,28 @@ import org.jboss.mx.util.MBeanServerLocator; /** -* @author Pawel Wrzeszcz (paw...@gm...) +* @author Pawel Wrzeszcz (pawel.wrzeszcz [at] gmail.com) */ -public class ScoresManager { - - private String portalName; +public class ScoresManager { - public ScoresManager(String portalName) { - this.portalName = portalName; + private static String portalName; + + public static void init(String portalName, ServiceConf serviceConf) { + ScoresManager.portalName = portalName; + System.out.println("local: " + serviceConf.isLocal()); } - public void save(Projects projects, List<PluginConf> pluginsConf) + public static void save(Projects projects, List<PluginConf> pluginsConf) throws ScoresSaveException { MBeanServer server = MBeanServerLocator.locate(); - ScoresService service; + ScoresServiceLocal service; try { - service = (ScoresService) MBeanProxyExt.create( - ScoresService.class, + service = (ScoresServiceLocal) MBeanProxyExt.create( + ScoresServiceLocal.class, Tools.STATUS_SERVICE_NAME, server); } catch (MalformedObjectNameException e) { @@ -70,7 +72,7 @@ } - public PluginsValues getScores(Date date, Date toDate) + public static PluginsValues getScores(Date date, Date toDate) throws GetScoresException { PluginsValues pluginsValues = null; @@ -108,7 +110,7 @@ * @return project score from the given date for specified plugin * @throws GetScoresException */ - public long getValue(String pluginId, String projectId, + public static long getValue(String pluginId, String projectId, Date date, Date toDate) throws GetScoresException { @@ -117,7 +119,7 @@ return pluginsValues.getPluginValue(pluginId, projectId); } - public PluginsValues getCurrentScores() + public static PluginsValues getCurrentScores() throws GetScoresException { Date now = new Date(); Added: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ServiceConf.java =================================================================== --- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ServiceConf.java 2006-04-24 11:00:44 UTC (rev 3943) +++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ServiceConf.java 2006-04-24 12:19:01 UTC (rev 3944) @@ -0,0 +1,52 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.jboss.forge.status.tools; + +import org.jboss.forge.common.XmlTools; +import org.jboss.forge.status.tools.Tags; + +import org.w3c.dom.Node; + +/** +* @author Pawel Wrzeszcz (pawel.wrzeszcz [at] gmail.com) +*/ +public class ServiceConf { + + boolean remoteService = false; + + public ServiceConf(Node serviceNode) { + + String remoteServiceString = + XmlTools.getChildNodeValue(serviceNode, + Tags.SERVICE_REMOTE_ELEMENT); + + if (remoteServiceString != null) { + remoteService = (remoteServiceString == "true"); + } + + } + + public boolean isLocal() { + return !remoteService; + } +} \ No newline at end of file Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tags.java =================================================================== --- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tags.java 2006-04-24 11:00:44 UTC (rev 3943) +++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tags.java 2006-04-24 12:19:01 UTC (rev 3944) @@ -56,6 +56,8 @@ public static final String METRIC_NAME_ELEMENT = "name"; public static final String METRIC_PLUGIN_ELEMENT = "plugin"; + /* service.xml tags */ + public static final String SERVICE_REMOTE_ELEMENT = "remote"; /* plugins.xml tags */ public final static String PLUGIN_ELEMENT = "plugin"; Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tools.java =================================================================== --- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tools.java 2006-04-24 11:00:44 UTC (rev 3943) +++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tools.java 2006-04-24 12:19:01 UTC (rev 3944) @@ -21,8 +21,9 @@ public class Tools { /** <code>STATUS_XML<code> - file defining the list of watched feeds */ - private final static String STATUS_XML = "status.xml"; - private final static String STATUS_PLUGINS_XML = "plugins.xml"; + private final static String STATUS_XML = "status.xml"; + private final static String STATUS_PLUGINS_XML = "plugins.xml"; + private final static String STATUS_SERVICE_XML = "service.xml"; /** <code>STATUS_DIR</code> - directory in which file <code>STATUS_XML<code> is stored. */ private final static String STATUS_DIR = "status"; @@ -36,7 +37,6 @@ private static final String SHOTOKU_STATUS_DIR = "status"; public static final String STATUS_SERVICE_NAME = "status:service=scores"; - //TODO move constans to one place @Inject private static ContentManager cm; @@ -69,6 +69,13 @@ public static String getXmlStatusPluginsCmPath(String portalName) { return portalName + "/" + STATUS_DIR + "/" + STATUS_PLUGINS_XML; } + + /** + * Path to the xml file defining ejb3 service. + */ + public static String getXmlServiceCmPath(String portalName) { + return portalName + "/" + STATUS_DIR + "/" + STATUS_SERVICE_XML; + } /** * Path to the projects.xml file. |
|
From: <jbo...@li...> - 2006-04-24 11:00:50
|
Author: rem...@jb...
Date: 2006-04-24 07:00:44 -0400 (Mon, 24 Apr 2006)
New Revision: 3943
Modified:
labs/jbossweb/trunk/src/share/resources/ROOT.war/index.html
Log:
- Add back a link to the web console.
Modified: labs/jbossweb/trunk/src/share/resources/ROOT.war/index.html
===================================================================
--- labs/jbossweb/trunk/src/share/resources/ROOT.war/index.html 2006-04-24 10:42:36 UTC (rev 3942)
+++ labs/jbossweb/trunk/src/share/resources/ROOT.war/index.html 2006-04-24 11:00:44 UTC (rev 3943)
@@ -50,9 +50,7 @@
<li><a href="/status">Server Status</a></li>
<li><a href="/status?full=true">Full Server Status</a></li>
<li><a href="/jmx-console/">JMX Console</a></li>
- <!--
<li><a href="/web-console/">JBoss Web Console</a></li>
- -->
</ul>
</p>
<br>
|
|
From: <jbo...@li...> - 2006-04-24 10:43:28
|
Author: arvinder Date: 2006-04-24 06:42:36 -0400 (Mon, 24 Apr 2006) New Revision: 3942 Added: labs/jbossesb/branches/JBESB-13/lib/dependency/microcontainer/concurrent.jar labs/jbossesb/branches/JBESB-13/lib/dependency/microcontainer/jboss-common.jar Modified: labs/jbossesb/branches/JBESB-13/lib/dependency/microcontainer/jboss-container.jar labs/jbossesb/branches/JBESB-13/lib/dependency/microcontainer/jboss-dependency.jar labs/jbossesb/branches/JBESB-13/lib/dependency/microcontainer/jboss-microcontainer.jar labs/jbossesb/branches/JBESB-13/lib/dependency/microcontainer/namespace.jar labs/jbossesb/branches/JBESB-13/lib/dependency/microcontainer/xercesImpl.jar labs/jbossesb/branches/JBESB-13/lib/dependency/microcontainer/xml-apis.jar Log: Dependency on MC 1.0.1 Added: labs/jbossesb/branches/JBESB-13/lib/dependency/microcontainer/concurrent.jar =================================================================== (Binary files differ) Property changes on: labs/jbossesb/branches/JBESB-13/lib/dependency/microcontainer/concurrent.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: labs/jbossesb/branches/JBESB-13/lib/dependency/microcontainer/jboss-common.jar =================================================================== (Binary files differ) Property changes on: labs/jbossesb/branches/JBESB-13/lib/dependency/microcontainer/jboss-common.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: labs/jbossesb/branches/JBESB-13/lib/dependency/microcontainer/jboss-container.jar =================================================================== (Binary files differ) Modified: labs/jbossesb/branches/JBESB-13/lib/dependency/microcontainer/jboss-dependency.jar =================================================================== (Binary files differ) Modified: labs/jbossesb/branches/JBESB-13/lib/dependency/microcontainer/jboss-microcontainer.jar =================================================================== (Binary files differ) Modified: labs/jbossesb/branches/JBESB-13/lib/dependency/microcontainer/namespace.jar =================================================================== (Binary files differ) Modified: labs/jbossesb/branches/JBESB-13/lib/dependency/microcontainer/xercesImpl.jar =================================================================== (Binary files differ) Modified: labs/jbossesb/branches/JBESB-13/lib/dependency/microcontainer/xml-apis.jar =================================================================== (Binary files differ) |
|
From: <jbo...@li...> - 2006-04-24 10:40:26
|
Author: arvinder
Date: 2006-04-24 06:40:21 -0400 (Mon, 24 Apr 2006)
New Revision: 3941
Modified:
labs/jbossesb/branches/JBESB-13/ESBCore/classes/org/jboss/soa/esbcore/deploy/bootstrap/container/JBossESBKernel.java
Log:
Dependency on MC 1.0.1 fo now means some methods I am using are unaavailable e.g getClassLoader
Modified: labs/jbossesb/branches/JBESB-13/ESBCore/classes/org/jboss/soa/esbcore/deploy/bootstrap/container/JBossESBKernel.java
===================================================================
--- labs/jbossesb/branches/JBESB-13/ESBCore/classes/org/jboss/soa/esbcore/deploy/bootstrap/container/JBossESBKernel.java 2006-04-24 10:19:24 UTC (rev 3940)
+++ labs/jbossesb/branches/JBESB-13/ESBCore/classes/org/jboss/soa/esbcore/deploy/bootstrap/container/JBossESBKernel.java 2006-04-24 10:40:21 UTC (rev 3941)
@@ -119,7 +119,7 @@
private void processCommandLine(final String[] args) throws Exception
{
// override default start properties
-
+
}
/**
@@ -168,7 +168,7 @@
{
//log.trace("KernelDeployment:BeanFactories=" + deployment.getBeanFactories());
log.trace("KernelDeployment:Bean =" + deployment.getBeans());
- log.trace("KernelDeployment:ClassLoader =" + deployment.getClassLoader());
+ //log.trace("KernelDeployment:ClassLoader =" + deployment.getClassLoader());
log.trace("KernelDeployment:InstalledCtxs=" + deployment.getInstalledContexts());
log.trace("KernelDeployment:Name =" + deployment.getName());
}
|
550 messages has been excluded from this view by a project administrator.
