[jboss-svn-commits] JBL Code SVN: r32421 - in labs/jbossrules/trunk: drools-container/drools-spring and 59 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Apr 5 14:11:11 EDT 2010
Author: lucazamador
Date: 2010-04-05 14:10:57 -0400 (Mon, 05 Apr 2010)
New Revision: 32421
Added:
labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/KnowledgeServiceBeanFactory.java
labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/KnowledgeServiceConfigurationBeanFactory.java
labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/KnowledgeServiceConfigurationDefinitionParser.java
labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/KnowledgeServiceConfigurationRefDefinitionParser.java
labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/KnowledgeServiceDefinitionParser.java
labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/ResourceRefDefinitionParser.java
labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/SpringDroolsServiceHandler.java
labs/jbossrules/trunk/drools-container/drools-spring/src/main/resources/org/drools/container/spring/drools-service-spring.xsd
labs/jbossrules/trunk/drools-container/drools-spring/src/test/resources/org/drools/container/spring/model.xsd
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/server/
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/server/KnowledgeService.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/server/profile/
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/server/profile/KnowledgeServiceConfiguration.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/xml/jaxb/util/DroolsJaxbContextHelper.java
labs/jbossrules/trunk/drools-server/drools-server-app/
labs/jbossrules/trunk/drools-server/drools-server-app/pom.xml
labs/jbossrules/trunk/drools-server/drools-server-app/src/
labs/jbossrules/trunk/drools-server/drools-server-app/src/main/
labs/jbossrules/trunk/drools-server/drools-server-app/src/main/java/
labs/jbossrules/trunk/drools-server/drools-server-app/src/main/java/org/
labs/jbossrules/trunk/drools-server/drools-server-app/src/main/java/org/apache/
labs/jbossrules/trunk/drools-server/drools-server-app/src/main/java/org/apache/camel/
labs/jbossrules/trunk/drools-server/drools-server-app/src/main/java/org/apache/camel/jboss/
labs/jbossrules/trunk/drools-server/drools-server-app/src/main/java/org/apache/camel/jboss/JBossPackageScanClassResolver.java
labs/jbossrules/trunk/drools-server/drools-server-app/src/main/java/org/drools/
labs/jbossrules/trunk/drools-server/drools-server-app/src/main/java/org/drools/server/
labs/jbossrules/trunk/drools-server/drools-server-app/src/main/java/org/drools/server/service/
labs/jbossrules/trunk/drools-server/drools-server-app/src/main/java/org/drools/server/service/KnowledgeServiceRest.java
labs/jbossrules/trunk/drools-server/drools-server-app/src/main/java/org/drools/server/service/KnowledgeServiceSoap.java
labs/jbossrules/trunk/drools-server/drools-server-app/src/main/java/org/drools/server/service/KnowledgeServiceSoapImpl.java
labs/jbossrules/trunk/drools-server/drools-server-app/src/main/resources/
labs/jbossrules/trunk/drools-server/drools-server-app/src/main/resources/META-INF/
labs/jbossrules/trunk/drools-server/drools-server-app/src/main/webapp/
labs/jbossrules/trunk/drools-server/drools-server-app/src/main/webapp/WEB-INF/
labs/jbossrules/trunk/drools-server/drools-server-app/src/main/webapp/WEB-INF/configuration.xml
labs/jbossrules/trunk/drools-server/drools-server-app/src/main/webapp/WEB-INF/core.xml
labs/jbossrules/trunk/drools-server/drools-server-app/src/main/webapp/WEB-INF/services.xml
labs/jbossrules/trunk/drools-server/drools-server-app/src/main/webapp/WEB-INF/sessions.xml
labs/jbossrules/trunk/drools-server/drools-server-app/src/main/webapp/WEB-INF/web.xml
labs/jbossrules/trunk/drools-server/drools-server-app/src/main/webapp/index.jsp
labs/jbossrules/trunk/drools-server/drools-server-app/src/test/
labs/jbossrules/trunk/drools-server/drools-server-app/src/test/java/
labs/jbossrules/trunk/drools-server/drools-server-app/src/test/java/org/
labs/jbossrules/trunk/drools-server/drools-server-app/src/test/java/org/drools/
labs/jbossrules/trunk/drools-server/drools-server-app/src/test/java/org/drools/pipeline/
labs/jbossrules/trunk/drools-server/drools-server-app/src/test/java/org/drools/pipeline/camel/
labs/jbossrules/trunk/drools-server/drools-server-app/src/test/java/org/drools/pipeline/camel/Person.java
labs/jbossrules/trunk/drools-server/drools-server-app/src/test/java/org/drools/server/
labs/jbossrules/trunk/drools-server/drools-server-app/src/test/java/org/drools/server/KnowledgeServiceBaseTest.java
labs/jbossrules/trunk/drools-server/drools-server-app/src/test/java/org/drools/server/examples/
labs/jbossrules/trunk/drools-server/drools-server-app/src/test/java/org/drools/server/service/
labs/jbossrules/trunk/drools-server/drools-server-app/src/test/java/org/drools/server/service/KnowledgeServiceRestTest.java
labs/jbossrules/trunk/drools-server/drools-server-app/src/test/java/org/drools/server/service/KnowledgeServiceSoapTest.java
labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/
labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/changesets/
labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/changesets/change-set-1.xml
labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/changesets/change-set-2.xml
labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/configuration-test.xml
labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/core-test.xml
labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/model/
labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/model/person.xsd
labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/rules/
labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/rules/person.drl
labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/rules/person2.drl
labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/services-test.xml
labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/sessions-test.xml
labs/jbossrules/trunk/drools-server/drools-server-spring/
labs/jbossrules/trunk/drools-server/drools-server-spring/pom.xml
labs/jbossrules/trunk/drools-server/drools-server-spring/src/
labs/jbossrules/trunk/drools-server/drools-server-spring/src/main/
labs/jbossrules/trunk/drools-server/drools-server-spring/src/main/java/
labs/jbossrules/trunk/drools-server/drools-server-spring/src/main/java/org/
labs/jbossrules/trunk/drools-server/drools-server-spring/src/main/java/org/drools/
labs/jbossrules/trunk/drools-server/drools-server-spring/src/main/java/org/drools/server/
labs/jbossrules/trunk/drools-server/drools-server-spring/src/main/java/org/drools/server/KnowledgeServiceImpl.java
labs/jbossrules/trunk/drools-server/drools-server-spring/src/main/resources/
labs/jbossrules/trunk/drools-server/drools-server-spring/src/main/resources/META-INF/
labs/jbossrules/trunk/drools-server/drools-server-spring/src/main/webapp/
labs/jbossrules/trunk/drools-server/drools-server-spring/src/main/webapp/WEB-INF/
labs/jbossrules/trunk/drools-server/drools-server-spring/src/main/webapp/WEB-INF/configuration.xml
labs/jbossrules/trunk/drools-server/drools-server-spring/src/main/webapp/WEB-INF/web.xml
labs/jbossrules/trunk/drools-server/drools-server-spring/src/main/webapp/index.jsp
labs/jbossrules/trunk/drools-server/drools-server-spring/src/test/
labs/jbossrules/trunk/drools-server/drools-server-spring/src/test/java/
labs/jbossrules/trunk/drools-server/drools-server-spring/src/test/resources/
labs/jbossrules/trunk/drools-server/drools-server-spring/src/test/resources/model/
labs/jbossrules/trunk/drools-server/drools-server-spring/src/test/resources/model/person.xsd
labs/jbossrules/trunk/drools-server/drools-server-spring/src/test/resources/rules/
labs/jbossrules/trunk/drools-server/drools-server-spring/src/test/resources/rules/person.drl
labs/jbossrules/trunk/drools-server/drools-server-spring/src/test/resources/rules/person2.drl
Removed:
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/runtime/impl/BatchExecutionImpl.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/server/KnowledgeService.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/server/profile/KnowledgeServiceConfiguration.java
labs/jbossrules/trunk/drools-server/.project
labs/jbossrules/trunk/drools-server/drools-server-app/pom.xml
labs/jbossrules/trunk/drools-server/drools-server-app/src/
labs/jbossrules/trunk/drools-server/drools-server-app/src/main/
labs/jbossrules/trunk/drools-server/drools-server-app/src/main/java/
labs/jbossrules/trunk/drools-server/drools-server-app/src/main/java/org/
labs/jbossrules/trunk/drools-server/drools-server-app/src/main/java/org/apache/
labs/jbossrules/trunk/drools-server/drools-server-app/src/main/java/org/apache/camel/
labs/jbossrules/trunk/drools-server/drools-server-app/src/main/java/org/apache/camel/jboss/
labs/jbossrules/trunk/drools-server/drools-server-app/src/main/java/org/apache/camel/jboss/JBossPackageScanClassResolver.java
labs/jbossrules/trunk/drools-server/drools-server-app/src/main/java/org/drools/
labs/jbossrules/trunk/drools-server/drools-server-app/src/main/java/org/drools/server/
labs/jbossrules/trunk/drools-server/drools-server-app/src/main/java/org/drools/server/service/
labs/jbossrules/trunk/drools-server/drools-server-app/src/main/java/org/drools/server/service/KnowledgeServiceRest.java
labs/jbossrules/trunk/drools-server/drools-server-app/src/main/java/org/drools/server/service/KnowledgeServiceSoap.java
labs/jbossrules/trunk/drools-server/drools-server-app/src/main/java/org/drools/server/service/KnowledgeServiceSoapImpl.java
labs/jbossrules/trunk/drools-server/drools-server-app/src/main/resources/
labs/jbossrules/trunk/drools-server/drools-server-app/src/main/resources/META-INF/
labs/jbossrules/trunk/drools-server/drools-server-app/src/main/webapp/
labs/jbossrules/trunk/drools-server/drools-server-app/src/main/webapp/WEB-INF/
labs/jbossrules/trunk/drools-server/drools-server-app/src/main/webapp/WEB-INF/configuration.xml
labs/jbossrules/trunk/drools-server/drools-server-app/src/main/webapp/WEB-INF/core.xml
labs/jbossrules/trunk/drools-server/drools-server-app/src/main/webapp/WEB-INF/services.xml
labs/jbossrules/trunk/drools-server/drools-server-app/src/main/webapp/WEB-INF/sessions.xml
labs/jbossrules/trunk/drools-server/drools-server-app/src/main/webapp/WEB-INF/web.xml
labs/jbossrules/trunk/drools-server/drools-server-app/src/main/webapp/index.jsp
labs/jbossrules/trunk/drools-server/drools-server-app/src/test/
labs/jbossrules/trunk/drools-server/drools-server-app/src/test/java/
labs/jbossrules/trunk/drools-server/drools-server-app/src/test/java/org/
labs/jbossrules/trunk/drools-server/drools-server-app/src/test/java/org/drools/
labs/jbossrules/trunk/drools-server/drools-server-app/src/test/java/org/drools/pipeline/
labs/jbossrules/trunk/drools-server/drools-server-app/src/test/java/org/drools/pipeline/camel/
labs/jbossrules/trunk/drools-server/drools-server-app/src/test/java/org/drools/pipeline/camel/Person.java
labs/jbossrules/trunk/drools-server/drools-server-app/src/test/java/org/drools/server/
labs/jbossrules/trunk/drools-server/drools-server-app/src/test/java/org/drools/server/KnowledgeServiceBaseTest.java
labs/jbossrules/trunk/drools-server/drools-server-app/src/test/java/org/drools/server/examples/
labs/jbossrules/trunk/drools-server/drools-server-app/src/test/java/org/drools/server/service/
labs/jbossrules/trunk/drools-server/drools-server-app/src/test/java/org/drools/server/service/KnowledgeServiceRestTest.java
labs/jbossrules/trunk/drools-server/drools-server-app/src/test/java/org/drools/server/service/KnowledgeServiceSoapTest.java
labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/
labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/changesets/
labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/changesets/change-set-1.xml
labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/changesets/change-set-2.xml
labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/configuration-test.xml
labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/core-test.xml
labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/model/
labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/model/person.xsd
labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/rules/
labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/rules/person.drl
labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/rules/person2.drl
labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/services-test.xml
labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/sessions-test.xml
labs/jbossrules/trunk/drools-server/drools-server-spring/pom.xml
labs/jbossrules/trunk/drools-server/drools-server-spring/src/
labs/jbossrules/trunk/drools-server/drools-server-spring/src/main/
labs/jbossrules/trunk/drools-server/drools-server-spring/src/main/java/
labs/jbossrules/trunk/drools-server/drools-server-spring/src/main/java/org/
labs/jbossrules/trunk/drools-server/drools-server-spring/src/main/java/org/drools/
labs/jbossrules/trunk/drools-server/drools-server-spring/src/main/java/org/drools/server/
labs/jbossrules/trunk/drools-server/drools-server-spring/src/main/java/org/drools/server/KnowledgeServiceImpl.java
labs/jbossrules/trunk/drools-server/drools-server-spring/src/main/resources/
labs/jbossrules/trunk/drools-server/drools-server-spring/src/main/resources/META-INF/
labs/jbossrules/trunk/drools-server/drools-server-spring/src/main/webapp/
labs/jbossrules/trunk/drools-server/drools-server-spring/src/main/webapp/WEB-INF/
labs/jbossrules/trunk/drools-server/drools-server-spring/src/main/webapp/WEB-INF/configuration.xml
labs/jbossrules/trunk/drools-server/drools-server-spring/src/main/webapp/WEB-INF/web.xml
labs/jbossrules/trunk/drools-server/drools-server-spring/src/main/webapp/index.jsp
labs/jbossrules/trunk/drools-server/drools-server-spring/src/test/
labs/jbossrules/trunk/drools-server/drools-server-spring/src/test/java/
labs/jbossrules/trunk/drools-server/drools-server-spring/src/test/resources/
labs/jbossrules/trunk/drools-server/drools-server-spring/src/test/resources/model/
labs/jbossrules/trunk/drools-server/drools-server-spring/src/test/resources/model/person.xsd
labs/jbossrules/trunk/drools-server/drools-server-spring/src/test/resources/rules/
labs/jbossrules/trunk/drools-server/drools-server-spring/src/test/resources/rules/person.drl
labs/jbossrules/trunk/drools-server/drools-server-spring/src/test/resources/rules/person2.drl
labs/jbossrules/trunk/drools-server/jboss.identity
labs/jbossrules/trunk/drools-server/sample-clients/
labs/jbossrules/trunk/drools-server/src/
Modified:
labs/jbossrules/trunk/drools-container/drools-spring/pom.xml
labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/KnowledgeBaseBeanFactory.java
labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/KnowledgeBaseDefinitionParser.java
labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/SpringDroolsHandler.java
labs/jbossrules/trunk/drools-container/drools-spring/src/main/resources/META-INF/spring.handlers
labs/jbossrules/trunk/drools-container/drools-spring/src/main/resources/META-INF/spring.schemas
labs/jbossrules/trunk/drools-container/drools-spring/src/main/resources/org/drools/container/spring/drools-spring.xsd
labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/SpringDroolsTest.java
labs/jbossrules/trunk/drools-container/drools-spring/src/test/resources/org/drools/container/spring/beans.xml
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/impl/CommandFactoryProviderImpl.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/impl/StatelessKnowledgeSessionImpl.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/runtime/help/impl/BatchExecutionHelperProviderImpl.java
labs/jbossrules/trunk/drools-pipeline/drools-camel/src/main/java/org/drools/camel/component/DroolsXStreamDataFormat.java
labs/jbossrules/trunk/drools-pipeline/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointWithJaxbTest.java
labs/jbossrules/trunk/drools-pipeline/drools-transformer-jaxb/src/main/java/org/drools/runtime/pipeline/impl/DroolsJaxbHelperProviderImpl.java
labs/jbossrules/trunk/drools-server/pom.xml
labs/jbossrules/trunk/drools-vsm/src/main/java/org/drools/vsm/local/ServiceManagerLocalClient.java
labs/jbossrules/trunk/pom.xml
Log:
merged new drools execution server
Modified: labs/jbossrules/trunk/drools-container/drools-spring/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/pom.xml 2010-04-05 16:42:59 UTC (rev 32420)
+++ labs/jbossrules/trunk/drools-container/drools-spring/pom.xml 2010-04-05 18:10:57 UTC (rev 32421)
@@ -40,75 +40,72 @@
<dependency>
<groupId>org.drools</groupId>
- <artifactId>drools-decisiontables</artifactId>
+ <artifactId>drools-server-spring</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.drools</groupId>
+ <artifactId>drools-decisiontables</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.drools</groupId>
<artifactId>drools-persistence-jpa</artifactId>
<optional>true</optional>
- </dependency>
-
- <dependency>
+ </dependency>
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>${spring.version}</version>
- </dependency>
-
- <dependency>
+ </dependency>
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>${spring.version}</version>
- </dependency>
-
- <dependency>
+ </dependency>
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId>
<version>${spring.version}</version>
<optional>true</optional>
</dependency>
-
- <dependency>
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<version>${spring.version}</version>
<optional>true</optional>
</dependency>
-
- <dependency>
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>${spring.version}</version>
</dependency>
-
- <dependency>
+ <dependency>
<groupId>javax.persistence</groupId>
<artifactId>persistence-api</artifactId>
<version>1.0</version>
<optional>true</optional>
</dependency>
-
- <dependency>
+ <dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
<version>3.4.0.GA</version>
<scope>test</scope>
</dependency>
-
- <dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.5.2</version>
<scope>test</scope>
</dependency>
-
- <dependency>
+ <dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>1.1.117</version>
<scope>test</scope>
</dependency>
- </dependencies>
+ </dependencies>
</project>
Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/KnowledgeBaseBeanFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/KnowledgeBaseBeanFactory.java 2010-04-05 16:42:59 UTC (rev 32420)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/KnowledgeBaseBeanFactory.java 2010-04-05 18:10:57 UTC (rev 32421)
@@ -1,16 +1,21 @@
package org.drools.container.spring.beans;
+import java.io.IOException;
import java.util.Collections;
import java.util.List;
import org.drools.KnowledgeBase;
import org.drools.builder.KnowledgeBuilder;
import org.drools.builder.KnowledgeBuilderErrors;
+import org.drools.builder.help.KnowledgeBuilderHelper;
import org.drools.vsm.ServiceManager;
import org.drools.vsm.local.ServiceManagerLocalClient;
import org.springframework.beans.factory.FactoryBean;
import org.springframework.beans.factory.InitializingBean;
+import com.sun.tools.xjc.Language;
+import com.sun.tools.xjc.Options;
+
public class KnowledgeBaseBeanFactory implements FactoryBean, InitializingBean {
private KnowledgeBase kbase;
@@ -19,6 +24,7 @@
// private String name;
// private String beanName;
private List<DroolsResourceAdapter> resources = Collections.emptyList();
+ private List<DroolsResourceAdapter> models = Collections.emptyList();
public Object getObject() throws Exception {
return kbase;
@@ -37,9 +43,29 @@
// setName(getBeanName());
// }
if (serviceManager == null) {
+ System.out.println("creating NEW SERVICE MANAGER LOCAL CLIENT");
serviceManager = new ServiceManagerLocalClient();
}
+
KnowledgeBuilder kbuilder = getServiceManager().getKnowledgeBuilderFactoryService().newKnowledgeBuilder();
+ kbase = getServiceManager().getKnowledgeBaseFactoryService().newKnowledgeBase();
+
+ if (models != null && models.size() > 0) {
+ for (DroolsResourceAdapter res: models) {
+ Options xjcOptions = new Options();
+ xjcOptions.setSchemaLanguage(Language.XMLSCHEMA);
+ try {
+ KnowledgeBuilderHelper.addXsdModel(res.getDroolsResource(),
+ kbuilder,
+ xjcOptions,
+ "xsd" );
+ kbase.addKnowledgePackages(kbuilder.getKnowledgePackages());
+ } catch (IOException e) {
+ throw new RuntimeException("Error creating XSD model", e);
+ }
+ }
+ }
+
for (DroolsResourceAdapter res: resources) {
if (res.getResourceConfiguration() == null) {
kbuilder.add(res.getDroolsResource(), res.getResourceType());
@@ -53,12 +79,8 @@
throw new RuntimeException(errors.toString());
}
-// kbase = getServiceManager().getKnowledgeBaseFactory().newKnowledgeBase(getName());
- kbase = getServiceManager().getKnowledgeBaseFactoryService().newKnowledgeBase();
kbase.addKnowledgePackages(kbuilder.getKnowledgePackages());
-
- ///
-
+
}
public KnowledgeBase getKbase() {
@@ -100,4 +122,12 @@
public void setServiceManager(ServiceManager serviceManager) {
this.serviceManager = serviceManager;
}
+
+ public void setModels(List<DroolsResourceAdapter> models) {
+ this.models = models;
+ }
+
+ public List<DroolsResourceAdapter> getModels() {
+ return models;
+ }
}
Copied: labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/KnowledgeServiceBeanFactory.java (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/KnowledgeServiceBeanFactory.java)
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/KnowledgeServiceBeanFactory.java (rev 0)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/KnowledgeServiceBeanFactory.java 2010-04-05 18:10:57 UTC (rev 32421)
@@ -0,0 +1,98 @@
+package org.drools.container.spring.beans;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.PackageScanClassResolver;
+import org.drools.server.KnowledgeService;
+import org.drools.server.KnowledgeServiceImpl;
+import org.drools.server.profile.KnowledgeServiceConfiguration;
+import org.springframework.beans.factory.FactoryBean;
+import org.springframework.beans.factory.InitializingBean;
+
+/**
+ *
+ * @author Lucas Amador
+ *
+ */
+public class KnowledgeServiceBeanFactory implements FactoryBean, InitializingBean {
+
+ private String id;
+ private CamelContext camelContext;
+ private PackageScanClassResolver packageClassLoaderResolver;
+ private KnowledgeService service;
+ private List<KnowledgeServiceConfiguration> configurations = Collections.emptyList();
+ private String smId;
+
+ public Object getObject() throws Exception {
+ return service;
+ }
+
+ public Class<? extends KnowledgeService> getObjectType() {
+ return KnowledgeService.class;
+ }
+
+ public boolean isSingleton() {
+ return true;
+ }
+
+ public void afterPropertiesSet() throws Exception {
+ Map<String, KnowledgeServiceConfiguration> configs = new HashMap<String, KnowledgeServiceConfiguration>();
+ for (KnowledgeServiceConfiguration cfg : configurations) {
+ configs.put(cfg.getSessionId(), cfg);
+ }
+ service = new KnowledgeServiceImpl(camelContext, configs, smId);
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setCamelContext(CamelContext camelContext) {
+ this.camelContext = camelContext;
+ }
+
+ public CamelContext getCamelContext() {
+ return camelContext;
+ }
+
+ public void setService(KnowledgeService service) {
+ this.service = service;
+ }
+
+ public KnowledgeService getService() {
+ return service;
+ }
+
+ public void setConfigurations(List<KnowledgeServiceConfiguration> configurations) {
+ this.configurations = configurations;
+ }
+
+ public List<KnowledgeServiceConfiguration> getConfigurations() {
+ return configurations;
+ }
+
+ public void setPackageClassLoaderResolver(PackageScanClassResolver packageClassLoaderResolver) {
+ this.packageClassLoaderResolver = packageClassLoaderResolver;
+ }
+
+ public PackageScanClassResolver getPackageClassLoaderResolver() {
+ return packageClassLoaderResolver;
+ }
+
+ public void setSmId(String smId) {
+ this.smId = smId;
+ }
+
+ public String getSmId() {
+ return smId;
+ }
+
+}
Copied: labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/KnowledgeServiceConfigurationBeanFactory.java (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/KnowledgeServiceConfigurationBeanFactory.java)
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/KnowledgeServiceConfigurationBeanFactory.java (rev 0)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/KnowledgeServiceConfigurationBeanFactory.java 2010-04-05 18:10:57 UTC (rev 32421)
@@ -0,0 +1,120 @@
+package org.drools.container.spring.beans;
+
+import java.util.Collections;
+import java.util.List;
+
+import javax.xml.bind.JAXBContext;
+
+import org.drools.KnowledgeBase;
+import org.drools.builder.help.KnowledgeBuilderHelper;
+import org.drools.common.InternalRuleBase;
+import org.drools.impl.KnowledgeBaseImpl;
+import org.drools.impl.StatefulKnowledgeSessionImpl;
+import org.drools.impl.StatelessKnowledgeSessionImpl;
+import org.drools.runtime.CommandExecutor;
+import org.drools.runtime.StatelessKnowledgeSession;
+import org.drools.server.profile.KnowledgeServiceConfiguration;
+import org.springframework.beans.factory.FactoryBean;
+import org.springframework.beans.factory.InitializingBean;
+
+/**
+ *
+ * @author Lucas Amador
+ *
+ */
+public class KnowledgeServiceConfigurationBeanFactory implements FactoryBean, InitializingBean {
+
+ private KnowledgeServiceConfiguration service;
+ private String id;
+ private String sessionId;
+ private CommandExecutor session;
+ private String marshaller;
+ private List<String> classes = Collections.emptyList();
+ private List<String> commands = Collections.emptyList();
+
+ public Object getObject() throws Exception {
+ return service;
+ }
+
+ public Class<? extends KnowledgeServiceConfiguration> getObjectType() {
+ return KnowledgeServiceConfiguration.class;
+ }
+
+ public boolean isSingleton() {
+ return true;
+ }
+
+ public void afterPropertiesSet() throws Exception {
+ JAXBContext context = null;
+ if (classes != null && classes.size() > 0) {
+ KnowledgeBase kbase = null;
+ if (session instanceof StatelessKnowledgeSession) {
+ InternalRuleBase ruleBase = ((StatelessKnowledgeSessionImpl)session).getRuleBase();
+ kbase = new KnowledgeBaseImpl(ruleBase);
+ } else if (session instanceof StatefulKnowledgeSessionImpl) {
+ kbase = ((StatefulKnowledgeSessionImpl) session).getKnowledgeBase();
+ } else {
+ throw new IllegalArgumentException("Unable to set ClassLoader on " + session);
+ }
+ context = KnowledgeBuilderHelper.newJAXBContext(classes.toArray(new String[classes.size()]), kbase);
+ }
+ service = new KnowledgeServiceConfiguration(id, sessionId, session, marshaller, context, commands);
+ }
+
+ public void setService(KnowledgeServiceConfiguration service) {
+ this.service = service;
+ }
+
+ public KnowledgeServiceConfiguration getService() {
+ return service;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setSessionId(String sessionId) {
+ this.sessionId = sessionId;
+ }
+
+ public String getSessionId() {
+ return sessionId;
+ }
+
+ public void setSession(CommandExecutor session) {
+ this.session = session;
+ }
+
+ public CommandExecutor getSession() {
+ return session;
+ }
+
+ public void setMarshaller(String marshaller) {
+ this.marshaller = marshaller;
+ }
+
+ public String getMarshaller() {
+ return marshaller;
+ }
+
+ public void setClasses(List<String> classes) {
+ this.classes = classes;
+ }
+
+ public List<String> getClasses() {
+ return classes;
+ }
+
+ public void setCommands(List<String> commands) {
+ this.commands = commands;
+ }
+
+ public List<String> getCommands() {
+ return commands;
+ }
+
+}
Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/KnowledgeBaseDefinitionParser.java
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/KnowledgeBaseDefinitionParser.java 2010-04-05 16:42:59 UTC (rev 32420)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/KnowledgeBaseDefinitionParser.java 2010-04-05 18:10:57 UTC (rev 32421)
@@ -25,15 +25,42 @@
factory.addPropertyReference(SERVICE_MANAGER_ATTRIBUTE, smRef);
List<Element> childElements = DomUtils.getChildElementsByTagName(element, "resource");
+ ManagedList resources = null;
if (childElements != null && !childElements.isEmpty()) {
- ManagedList resources = new ManagedList(childElements.size());
+ resources = new ManagedList();
for (Element childResource : childElements) {
BeanDefinition resourceDefinition = parserContext.getDelegate().parseCustomElement(childResource, factory.getBeanDefinition());
resources.add(resourceDefinition);
}
+ }
+
+ childElements = DomUtils.getChildElementsByTagName(element, "resource-ref");
+
+ if (childElements != null && !childElements.isEmpty()) {
+ if (resources==null) {
+ resources = new ManagedList(childElements.size());
+ }
+ for (Element childResource : childElements) {
+ BeanDefinition resourceDefinition = parserContext.getDelegate().parseCustomElement(childResource, factory.getBeanDefinition());
+ resources.add(resourceDefinition);
+ }
+ }
+
+ if (resources!=null) {
factory.addPropertyValue("resources", resources);
}
-
+
+ childElements = DomUtils.getChildElementsByTagName(element, "model");
+
+ if (childElements != null && !childElements.isEmpty()) {
+ ManagedList models = new ManagedList(childElements.size());
+ for (Element childResource : childElements) {
+ BeanDefinition resourceDefinition = parserContext.getDelegate().parseCustomElement(childResource, factory.getBeanDefinition());
+ models.add(resourceDefinition);
+ }
+ factory.addPropertyValue("models", models);
+ }
+
return factory.getBeanDefinition();
}
Copied: labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/KnowledgeServiceConfigurationDefinitionParser.java (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/KnowledgeServiceConfigurationDefinitionParser.java)
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/KnowledgeServiceConfigurationDefinitionParser.java (rev 0)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/KnowledgeServiceConfigurationDefinitionParser.java 2010-04-05 18:10:57 UTC (rev 32421)
@@ -0,0 +1,88 @@
+package org.drools.container.spring.namespace;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.drools.container.spring.beans.KnowledgeServiceConfigurationBeanFactory;
+import org.springframework.beans.factory.support.AbstractBeanDefinition;
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser;
+import org.springframework.beans.factory.xml.ParserContext;
+import org.springframework.util.xml.DomUtils;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+/**
+ *
+ * @author Lucas Amador
+ *
+ */
+public class KnowledgeServiceConfigurationDefinitionParser extends AbstractBeanDefinitionParser {
+
+ private static final String ID_ATTRIBUTE = "id";
+ private static final String SESSION_ATTRIBUTE = "session";
+ private static final String MARSHALLER_ATTRIBUTE = "marshaller";
+ private static final String CLASS_ELEMENT = "class";
+ private static final String STARTUP_COMMAND_ELEMENT = "startup-command";
+
+ @SuppressWarnings("unchecked")
+ @Override
+ protected AbstractBeanDefinition parseInternal(Element element, ParserContext parserContext) {
+
+ String id = element.getAttribute(ID_ATTRIBUTE);
+
+ BeanDefinitionBuilder factory = BeanDefinitionBuilder.rootBeanDefinition(KnowledgeServiceConfigurationBeanFactory.class);
+ if (id!=null && id.length() > 0) {
+ factory.addPropertyValue("id", id);
+ }
+
+ String ksession = element.getAttribute(SESSION_ATTRIBUTE);
+ emptyAttributeCheck(element.getLocalName(), SESSION_ATTRIBUTE, ksession);
+ factory.addPropertyReference("session", ksession);
+ factory.addPropertyValue("sessionId", ksession);
+
+ String marshaller = element.getAttribute(MARSHALLER_ATTRIBUTE);
+ emptyAttributeCheck(element.getLocalName(), MARSHALLER_ATTRIBUTE, marshaller);
+ factory.addPropertyValue("marshaller", marshaller);
+
+ List<Element> childElements = DomUtils.getChildElementsByTagName(element, CLASS_ELEMENT);
+
+ if (childElements != null && !childElements.isEmpty()) {
+ List<String> classes = new ArrayList<String>();
+ for (Element childResource : childElements) {
+ NodeList childNodes = childResource.getChildNodes();
+ for (int i = 0; i < childNodes.getLength(); i++) {
+ Node item = childNodes.item(i);
+ classes.add(item.getNodeValue());
+ }
+ }
+ factory.addPropertyValue("classes", classes);
+ }
+
+ childElements = DomUtils.getChildElementsByTagName(element, STARTUP_COMMAND_ELEMENT);
+
+ if (childElements != null && !childElements.isEmpty()) {
+ List<String> commands = new ArrayList<String>();
+ for (Element childResource : childElements) {
+ NodeList childNodes = childResource.getChildNodes();
+ for (int i = 0; i < childNodes.getLength(); i++) {
+ Node item = childNodes.item(i);
+ if (item.getNodeValue().trim().length() > 0) {
+ commands.add(item.getNodeValue().trim());
+ }
+ }
+ }
+ factory.addPropertyValue("commands", commands);
+ }
+
+ return factory.getBeanDefinition();
+ }
+
+ public void emptyAttributeCheck(final String element, final String attributeName, final String attribute) {
+ if (attribute == null || attribute.trim().length() == 0) {
+ throw new IllegalArgumentException("<" + element + "> requires a '" + attributeName + "' attribute");
+ }
+ }
+
+}
Copied: labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/KnowledgeServiceConfigurationRefDefinitionParser.java (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/KnowledgeServiceConfigurationRefDefinitionParser.java)
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/KnowledgeServiceConfigurationRefDefinitionParser.java (rev 0)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/KnowledgeServiceConfigurationRefDefinitionParser.java 2010-04-05 18:10:57 UTC (rev 32421)
@@ -0,0 +1,30 @@
+package org.drools.container.spring.namespace;
+
+import org.springframework.beans.factory.support.AbstractBeanDefinition;
+import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser;
+import org.springframework.beans.factory.xml.ParserContext;
+import org.w3c.dom.Element;
+
+/**
+ *
+ * @author Lucas Amador
+ *
+ */
+public class KnowledgeServiceConfigurationRefDefinitionParser extends AbstractBeanDefinitionParser {
+
+ private static final String ID_ATTRIBUTE = "id";
+
+ @Override
+ protected AbstractBeanDefinition parseInternal(Element element, ParserContext parserContext) {
+ String id = element.getAttribute(ID_ATTRIBUTE);
+ emptyAttributeCheck(element.getLocalName(), ID_ATTRIBUTE, id);
+ return (AbstractBeanDefinition) parserContext.getRegistry().getBeanDefinition(id);
+ }
+
+ public void emptyAttributeCheck(final String element, final String attributeName, final String attribute) {
+ if (attribute == null || attribute.trim().length() == 0) {
+ throw new IllegalArgumentException("<" + element + "> requires a '" + attributeName + "' attribute");
+ }
+ }
+
+}
Copied: labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/KnowledgeServiceDefinitionParser.java (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/KnowledgeServiceDefinitionParser.java)
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/KnowledgeServiceDefinitionParser.java (rev 0)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/KnowledgeServiceDefinitionParser.java 2010-04-05 18:10:57 UTC (rev 32421)
@@ -0,0 +1,85 @@
+package org.drools.container.spring.namespace;
+
+import java.util.List;
+
+import org.drools.container.spring.beans.KnowledgeServiceBeanFactory;
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.support.AbstractBeanDefinition;
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.support.ManagedList;
+import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser;
+import org.springframework.beans.factory.xml.ParserContext;
+import org.springframework.util.xml.DomUtils;
+import org.w3c.dom.Element;
+
+/**
+ *
+ * @author Lucas Amador
+ *
+ */
+public class KnowledgeServiceDefinitionParser extends AbstractBeanDefinitionParser {
+
+ private static final String ID_ATTRIBUTE = "id";
+ private static final String CAMEL_CONTEXT_ATTRIBUTE = "camelContext";
+ private static final String SM_ID_ATTRIBUTE = "smId";
+ private static final String CONFIGURATION_ELEMENT = "configuration";
+ private static final String CONFIGURATION_REF_ELEMENT = "configuration-ref";
+
+ @SuppressWarnings("unchecked")
+ @Override
+ protected AbstractBeanDefinition parseInternal(Element element, ParserContext parserContext) {
+
+ String id = element.getAttribute(ID_ATTRIBUTE);
+ emptyAttributeCheck(element.getLocalName(), ID_ATTRIBUTE, id);
+
+ BeanDefinitionBuilder factory = BeanDefinitionBuilder.rootBeanDefinition(KnowledgeServiceBeanFactory.class);
+
+ factory.addPropertyValue("id", id);
+
+ String smId = element.getAttribute(SM_ID_ATTRIBUTE);
+ emptyAttributeCheck(element.getLocalName(), SM_ID_ATTRIBUTE, smId);
+
+ factory.addPropertyValue("smId", smId);
+
+ String camelContextId = element.getAttribute(CAMEL_CONTEXT_ATTRIBUTE);
+ emptyAttributeCheck(element.getLocalName(), CAMEL_CONTEXT_ATTRIBUTE, camelContextId);
+
+ factory.addPropertyReference(CAMEL_CONTEXT_ATTRIBUTE, camelContextId);
+
+ List<Element> childElements = DomUtils.getChildElementsByTagName(element, CONFIGURATION_ELEMENT);
+ ManagedList configurations = null;
+
+ if (childElements != null && !childElements.isEmpty()) {
+ configurations = new ManagedList(childElements.size());
+ for (Element childResource : childElements) {
+ BeanDefinition resourceDefinition = parserContext.getDelegate().parseCustomElement(childResource, factory.getBeanDefinition());
+ configurations.add(resourceDefinition);
+ }
+ }
+
+ childElements = DomUtils.getChildElementsByTagName(element, CONFIGURATION_REF_ELEMENT);
+
+ if (childElements != null && !childElements.isEmpty()) {
+ if (configurations==null) {
+ configurations = new ManagedList(childElements.size());
+ }
+ for (Element childResource : childElements) {
+ BeanDefinition resourceDefinition = parserContext.getDelegate().parseCustomElement(childResource, factory.getBeanDefinition());
+ configurations.add(resourceDefinition);
+ }
+ }
+
+ if (configurations!=null) {
+ factory.addPropertyValue("configurations", configurations);
+ }
+
+ return factory.getBeanDefinition();
+ }
+
+ public void emptyAttributeCheck(final String element, final String attributeName, final String attribute) {
+ if (attribute == null || attribute.trim().length() == 0) {
+ throw new IllegalArgumentException("<" + element + "> requires a '" + attributeName + "' attribute");
+ }
+ }
+
+}
Copied: labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/ResourceRefDefinitionParser.java (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/ResourceRefDefinitionParser.java)
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/ResourceRefDefinitionParser.java (rev 0)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/ResourceRefDefinitionParser.java 2010-04-05 18:10:57 UTC (rev 32421)
@@ -0,0 +1,24 @@
+package org.drools.container.spring.namespace;
+
+import org.springframework.beans.factory.support.AbstractBeanDefinition;
+import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser;
+import org.springframework.beans.factory.xml.ParserContext;
+import org.w3c.dom.Element;
+
+public class ResourceRefDefinitionParser extends AbstractBeanDefinitionParser {
+
+ private static final String ID_ATTRIBUTE = "id";
+
+ @Override
+ protected AbstractBeanDefinition parseInternal(Element element, ParserContext parserContext) {
+ String id = element.getAttribute(ID_ATTRIBUTE);
+ emptyAttributeCheck(element.getLocalName(), ID_ATTRIBUTE, id);
+ return (AbstractBeanDefinition) parserContext.getRegistry().getBeanDefinition(id);
+ }
+
+ public void emptyAttributeCheck(final String element, final String attributeName, final String attribute) {
+ if (attribute == null || attribute.trim().equals("")) {
+ throw new IllegalArgumentException("<" + element + "> requires a '" + attributeName + "' attribute");
+ }
+ }
+}
Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/SpringDroolsHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/SpringDroolsHandler.java 2010-04-05 16:42:59 UTC (rev 32420)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/SpringDroolsHandler.java 2010-04-05 18:10:57 UTC (rev 32421)
@@ -9,11 +9,19 @@
registerBeanDefinitionParser("resource", new ResourceDefinitionParser());
+ registerBeanDefinitionParser("resource-ref", new ResourceRefDefinitionParser());
+
+ registerBeanDefinitionParser("model", new ResourceDefinitionParser());
+
registerBeanDefinitionParser("kbase", new KnowledgeBaseDefinitionParser());
registerBeanDefinitionParser("ksession", new KnowledgeSessionDefinitionParser());
+ registerBeanDefinitionParser("service", new KnowledgeServiceDefinitionParser());
+ registerBeanDefinitionParser("service-conf", new KnowledgeServiceConfigurationDefinitionParser());
+
+ registerBeanDefinitionParser("service-conf-ref", new KnowledgeServiceConfigurationRefDefinitionParser());
}
Copied: labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/SpringDroolsServiceHandler.java (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/SpringDroolsServiceHandler.java)
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/SpringDroolsServiceHandler.java (rev 0)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/SpringDroolsServiceHandler.java 2010-04-05 18:10:57 UTC (rev 32421)
@@ -0,0 +1,17 @@
+package org.drools.container.spring.namespace;
+
+import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
+
+public class SpringDroolsServiceHandler extends NamespaceHandlerSupport {
+
+ public void init() {
+
+ registerBeanDefinitionParser("definition", new KnowledgeServiceDefinitionParser());
+
+ registerBeanDefinitionParser("configuration", new KnowledgeServiceConfigurationDefinitionParser());
+
+ registerBeanDefinitionParser("configuration-ref", new KnowledgeServiceConfigurationRefDefinitionParser());
+
+ }
+
+}
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/main/resources/META-INF/spring.handlers
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/main/resources/META-INF/spring.handlers 2010-04-05 16:42:59 UTC (rev 32420)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/resources/META-INF/spring.handlers 2010-04-05 18:10:57 UTC (rev 32421)
@@ -1 +1,2 @@
-http\://drools.org/schema/drools-spring=org.drools.container.spring.namespace.SpringDroolsHandler
\ No newline at end of file
+http\://drools.org/schema/drools-spring=org.drools.container.spring.namespace.SpringDroolsHandler
+http\://drools.org/schema/drools-service-spring=org.drools.container.spring.namespace.SpringDroolsServiceHandler
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/main/resources/META-INF/spring.schemas
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/main/resources/META-INF/spring.schemas 2010-04-05 16:42:59 UTC (rev 32420)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/resources/META-INF/spring.schemas 2010-04-05 18:10:57 UTC (rev 32421)
@@ -1 +1,2 @@
-http\://drools.org/schema/drools-spring.xsd=org/drools/container/spring/drools-spring.xsd
\ No newline at end of file
+http\://drools.org/schema/drools-spring.xsd=org/drools/container/spring/drools-spring.xsd
+http\://drools.org/schema/drools-service-spring.xsd=org/drools/container/spring/drools-service-spring.xsd
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-container/drools-spring/src/main/resources/org/drools/container/spring/drools-service-spring.xsd (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-container/drools-spring/src/main/resources/org/drools/container/spring/drools-service-spring.xsd)
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/main/resources/org/drools/container/spring/drools-service-spring.xsd (rev 0)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/resources/org/drools/container/spring/drools-service-spring.xsd 2010-04-05 18:10:57 UTC (rev 32421)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns="http://drools.org/schema/drools-service-spring"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="http://drools.org/schema/drools-service-spring"
+ elementFormDefault="qualified"
+ attributeFormDefault="unqualified">
+
+ <xsd:simpleType name="marshallerTypeEnum">
+ <xsd:restriction base="xsd:string">
+ <xsd:enumeration value="JAXB" />
+ <xsd:enumeration value="XSTREAM" />
+ </xsd:restriction>
+ </xsd:simpleType>
+
+ <xsd:complexType name="serviceConfType">
+ <xsd:sequence>
+ <xsd:element name="class" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
+ <xsd:element name="startup-command" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
+ </xsd:sequence>
+ <xsd:attribute name="session" use="required" type="xsd:string" />
+ <xsd:attribute name="marshaller" use="required" type="marshallerTypeEnum"/>
+ </xsd:complexType>
+
+ <xsd:complexType name="serviceConfRefType">
+ <xsd:attribute name="id" use="required" type="xsd:string"/>
+ </xsd:complexType>
+
+ <xsd:element name="configuration">
+ <xsd:complexType>
+ <xsd:complexContent>
+ <xsd:extension base="serviceConfType">
+ <xsd:attribute name="id" use="required" type="xsd:ID"/>
+ </xsd:extension>
+ </xsd:complexContent>
+ </xsd:complexType>
+ </xsd:element>
+
+ <xsd:element name="definition">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="configuration" type="serviceConfType" minOccurs="0" maxOccurs="unbounded" />
+ <xsd:element name="configuration-ref" type="serviceConfRefType" minOccurs="0" maxOccurs="unbounded" />
+ </xsd:sequence>
+ <xsd:attribute name="id" use="required" type="xsd:ID"/>
+ <xsd:attribute name="smId" use="required" type="xsd:string"/>
+ <xsd:attribute name="camelContext" use="required" type="xsd:string"/>
+ </xsd:complexType>
+ </xsd:element>
+
+</xsd:schema>
Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/main/resources/org/drools/container/spring/drools-spring.xsd
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/main/resources/org/drools/container/spring/drools-spring.xsd 2010-04-05 16:42:59 UTC (rev 32420)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/resources/org/drools/container/spring/drools-spring.xsd 2010-04-05 18:10:57 UTC (rev 32421)
@@ -25,7 +25,7 @@
<xsd:enumeration value="CHANGE_SET" />
</xsd:restriction>
</xsd:simpleType>
-
+
<xsd:complexType name="resourceType">
<xsd:sequence>
<xsd:element name="decisiontable-conf" minOccurs="0" maxOccurs="1">
@@ -38,6 +38,10 @@
<xsd:attribute name="source" use="required" type="xsd:string"/>
<xsd:attribute name="type" use="required" type="resourceTypeEnum"/>
</xsd:complexType>
+
+ <xsd:complexType name="resourceRefType">
+ <xsd:attribute name="id" use="required" type="xsd:string"/>
+ </xsd:complexType>
<xsd:element name="resource">
<xsd:complexType>
@@ -47,12 +51,24 @@
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
- </xsd:element>
+ </xsd:element>
+
+ <xsd:complexType name="modelType">
+ <xsd:attribute name="source" use="required" type="xsd:string"/>
+ </xsd:complexType>
+
+ <xsd:complexType name="classesType">
+ <xsd:sequence>
+ <xsd:element name="class" type="xsd:string" />
+ </xsd:sequence>
+ </xsd:complexType>
<xsd:element name="kbase">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="resource" type="resourceType" maxOccurs="unbounded"/>
+ <xsd:element name="resource-ref" type="resourceRefType" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="model" type="modelType" minOccurs="0" maxOccurs="unbounded"/>
</xsd:sequence>
<xsd:attribute name="id" use="optional" type="xsd:ID"/>
<xsd:attribute name="serviceManager" use="optional" type="xsd:string"/>
@@ -68,7 +84,7 @@
<xsd:attribute name="name" use="optional" type="xsd:string"/>
</xsd:complexType>
</xsd:element>
-
+
<!--
<xsd:element name="serviceManager">
Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/SpringDroolsTest.java
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/SpringDroolsTest.java 2010-04-05 16:42:59 UTC (rev 32420)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/SpringDroolsTest.java 2010-04-05 18:10:57 UTC (rev 32421)
@@ -8,6 +8,8 @@
import org.drools.Person;
import org.drools.runtime.StatefulKnowledgeSession;
import org.drools.runtime.StatelessKnowledgeSession;
+import org.drools.server.KnowledgeService;
+import org.drools.server.profile.KnowledgeServiceConfiguration;
import org.drools.vsm.ServiceManager;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -50,4 +52,13 @@
kstateful.fireAllRules();
assertEquals( 2, list.size() );
}
+
+ public void test3() {
+ ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext( "org/drools/container/spring/beans.xml" );
+ KnowledgeServiceConfiguration kserviceConf1 = (KnowledgeServiceConfiguration)context.getBean( "service-conf-1" );
+ assertNotNull(kserviceConf1);
+ assertEquals("XSTREAM", kserviceConf1.getMarshaller());
+ KnowledgeService kservice = (KnowledgeService)context.getBean( "service" );
+ assertNotNull(kservice);
+ }
}
Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/test/resources/org/drools/container/spring/beans.xml
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/test/resources/org/drools/container/spring/beans.xml 2010-04-05 16:42:59 UTC (rev 32420)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/test/resources/org/drools/container/spring/beans.xml 2010-04-05 18:10:57 UTC (rev 32421)
@@ -1,23 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:drools="http://drools.org/schema/drools-spring"
+ xmlns:drools="http://drools.org/schema/drools-spring"
+ xmlns:drools-service="http://drools.org/schema/drools-service-spring"
+ xmlns:camel="http://camel.apache.org/schema/spring"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://drools.org/schema/drools-spring http://drools.org/schema/drools-spring.xsd">
-
+ http://drools.org/schema/drools-spring http://drools.org/schema/drools-spring.xsd
+ http://drools.org/schema/drools-service-spring http://drools.org/schema/drools-service-spring.xsd
+ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
+
+
+<camelContext id="executionContext" xmlns="http://camel.apache.org/schema/spring" />
+
<bean id="sm1" class="org.drools.vsm.local.ServiceManagerLocalClient" />
+<drools:resource id="resource1" type="DRL" source="classpath:org/drools/container/spring/testSpring.drl"/>
+
<drools:kbase id="kbase1" serviceManager="sm1">
- <drools:resource type="DRL" source="classpath:org/drools/container/spring/testSpring.drl"/>
<drools:resource source="classpath:org/drools/container/spring/IntegrationExampleTest.xls" type="DTABLE">
<drools:decisiontable-conf input-type="XLS" worksheet-name="Tables_2" />
</drools:resource>
+ <drools:resource-ref id="resource1"/>
+ <drools:model source="classpath:org/drools/container/spring/model.xsd" />
</drools:kbase>
-<drools:ksession id="ksession1" type="stateless" name="stateless1"
- kbase="kbase1" serviceManager="sm1"/>
+<drools:ksession id="ksession1" type="stateless" name="stateless1" kbase="kbase1" serviceManager="sm1"/>
-<drools:ksession id="ksession2" type="stateful"
- kbase="kbase1" serviceManager="sm1"/>
-
+<drools:ksession id="ksession2" type="stateful" kbase="kbase1" serviceManager="sm1"/>
+
+<drools-service:configuration id="service-conf-1" marshaller="XSTREAM" session="ksession1">
+ <drools-service:class>org.drools.model.Person</drools-service:class>
+</drools-service:configuration>
+
+<drools-service:definition id="service" smId="sm1" camelContext="executionContext">
+ <drools-service:configuration marshaller="JAXB" session="ksession2" />
+ <drools-service:configuration-ref id="service-conf-1" />
+</drools-service:definition>
+
</beans>
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-container/drools-spring/src/test/resources/org/drools/container/spring/model.xsd (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-container/drools-spring/src/test/resources/org/drools/container/spring/model.xsd)
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/test/resources/org/drools/container/spring/model.xsd (rev 0)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/test/resources/org/drools/container/spring/model.xsd 2010-04-05 18:10:57 UTC (rev 32421)
@@ -0,0 +1,14 @@
+<xsd:schema
+ xmlns:person="http://drools.org/model"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="http://drools.org/model"
+ elementFormDefault="qualified"
+>
+ <xsd:complexType name="person">
+ <xsd:sequence>
+ <xsd:element name="name" type="xsd:string" />
+ <xsd:element name="age" type="xsd:integer" />
+ </xsd:sequence>
+ </xsd:complexType>
+
+</xsd:schema>
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/impl/CommandFactoryProviderImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/impl/CommandFactoryProviderImpl.java 2010-04-05 16:42:59 UTC (rev 32420)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/impl/CommandFactoryProviderImpl.java 2010-04-05 18:10:57 UTC (rev 32421)
@@ -7,6 +7,7 @@
import org.drools.command.Command;
import org.drools.command.CommandFactoryProvider;
import org.drools.command.Setter;
+import org.drools.command.runtime.BatchExecutionCommand;
import org.drools.command.runtime.GetGlobalCommand;
import org.drools.command.runtime.SetGlobalCommand;
import org.drools.command.runtime.process.AbortWorkItemCommand;
@@ -16,14 +17,12 @@
import org.drools.command.runtime.rule.FireAllRulesCommand;
import org.drools.command.runtime.rule.GetObjectCommand;
import org.drools.command.runtime.rule.GetObjectsCommand;
-import org.drools.command.runtime.rule.InsertElementsCommand;
import org.drools.command.runtime.rule.InsertObjectCommand;
import org.drools.command.runtime.rule.ModifyCommand;
import org.drools.command.runtime.rule.QueryCommand;
import org.drools.command.runtime.rule.RetractCommand;
import org.drools.command.runtime.rule.ModifyCommand.SetterImpl;
import org.drools.runtime.ObjectFilter;
-import org.drools.runtime.impl.BatchExecutionImpl;
import org.drools.runtime.rule.FactHandle;
public class CommandFactoryProviderImpl implements CommandFactoryProvider {
@@ -148,7 +147,6 @@
}
public Command newBatchExecution(List<? extends Command> commands) {
- return new BatchExecutionImpl(
- (List<GenericCommand>) commands);
+ return new BatchExecutionCommand((List<GenericCommand<?>>) commands);
}
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/impl/StatelessKnowledgeSessionImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/impl/StatelessKnowledgeSessionImpl.java 2010-04-05 16:42:59 UTC (rev 32420)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/impl/StatelessKnowledgeSessionImpl.java 2010-04-05 18:10:57 UTC (rev 32421)
@@ -2,13 +2,9 @@
import java.util.Collection;
import java.util.Collections;
-import java.util.HashMap;
import java.util.IdentityHashMap;
-import java.util.Iterator;
import java.util.Map;
-import java.util.Map.Entry;
-import org.drools.RuleBaseConfiguration;
import org.drools.SessionConfiguration;
import org.drools.agent.KnowledgeAgent;
import org.drools.base.MapGlobalResolver;
@@ -16,9 +12,9 @@
import org.drools.command.impl.ContextImpl;
import org.drools.command.impl.GenericCommand;
import org.drools.command.impl.KnowledgeCommandContext;
+import org.drools.command.runtime.BatchExecutionCommand;
import org.drools.command.runtime.rule.FireAllRulesCommand;
import org.drools.common.InternalRuleBase;
-import org.drools.common.InternalWorkingMemory;
import org.drools.event.AgendaEventSupport;
import org.drools.event.RuleFlowEventSupport;
import org.drools.event.WorkingMemoryEventSupport;
@@ -33,14 +29,12 @@
import org.drools.reteoo.ReteooWorkingMemory;
import org.drools.reteoo.ReteooWorkingMemory.WorkingMemoryReteAssertAction;
import org.drools.rule.EntryPoint;
-import org.drools.runtime.ExecutionResults;
import org.drools.runtime.Environment;
+import org.drools.runtime.ExecutionResults;
import org.drools.runtime.Globals;
import org.drools.runtime.KnowledgeSessionConfiguration;
import org.drools.runtime.StatefulKnowledgeSession;
import org.drools.runtime.StatelessKnowledgeSession;
-import org.drools.runtime.StatelessKnowledgeSessionResults;
-import org.drools.runtime.impl.BatchExecutionImpl;
import org.drools.runtime.impl.ExecutionResultImpl;
import org.drools.runtime.rule.AgendaFilter;
@@ -243,8 +237,8 @@
boolean autoFireAllRules = true;
if ( command instanceof FireAllRulesCommand ) {
autoFireAllRules = false;
- } else if ( command instanceof BatchExecutionImpl ) {
- for ( Command nestedCmd : ((BatchExecutionImpl) command).getCommands() ) {
+ } else if ( command instanceof BatchExecutionCommand ) {
+ for ( Command nestedCmd : ((BatchExecutionCommand) command).getCommands() ) {
if ( nestedCmd instanceof FireAllRulesCommand ) {
autoFireAllRules = false;
break;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/runtime/help/impl/BatchExecutionHelperProviderImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/runtime/help/impl/BatchExecutionHelperProviderImpl.java 2010-04-05 16:42:59 UTC (rev 32420)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/runtime/help/impl/BatchExecutionHelperProviderImpl.java 2010-04-05 18:10:57 UTC (rev 32421)
@@ -13,6 +13,7 @@
import org.drools.command.Command;
import org.drools.command.CommandFactory;
import org.drools.command.Setter;
+import org.drools.command.runtime.BatchExecutionCommand;
import org.drools.command.runtime.GetGlobalCommand;
import org.drools.command.runtime.SetGlobalCommand;
import org.drools.command.runtime.process.AbortWorkItemCommand;
@@ -27,14 +28,11 @@
import org.drools.command.runtime.rule.ModifyCommand;
import org.drools.command.runtime.rule.QueryCommand;
import org.drools.command.runtime.rule.RetractCommand;
-import org.drools.command.runtime.rule.ModifyCommand.SetterImpl;
-import org.drools.common.DisconnectedFactHandle;
-import org.drools.common.InternalFactHandle;
import org.drools.common.DefaultFactHandle;
+import org.drools.common.DisconnectedFactHandle;
import org.drools.rule.Declaration;
import org.drools.runtime.ExecutionResults;
import org.drools.runtime.help.BatchExecutionHelperProvider;
-import org.drools.runtime.impl.BatchExecutionImpl;
import org.drools.runtime.impl.ExecutionResultImpl;
import org.drools.runtime.rule.FactHandle;
import org.drools.runtime.rule.QueryResults;
@@ -64,12 +62,12 @@
ElementNames names = new XmlElementNames();
// xstream.setMode( XStream.NO_REFERENCES );
- xstream.processAnnotations( BatchExecutionImpl.class );
- xstream.addImplicitCollection( BatchExecutionImpl.class,
+ xstream.processAnnotations( BatchExecutionCommand.class );
+ xstream.addImplicitCollection( BatchExecutionCommand.class,
"commands" );
xstream.alias( "batch-execution",
- BatchExecutionImpl.class );
+ BatchExecutionCommand.class );
xstream.alias( "insert",
InsertObjectCommand.class );
xstream.alias( "modify",
Deleted: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/runtime/impl/BatchExecutionImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/runtime/impl/BatchExecutionImpl.java 2010-04-05 16:42:59 UTC (rev 32420)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/runtime/impl/BatchExecutionImpl.java 2010-04-05 18:10:57 UTC (rev 32421)
@@ -1,42 +0,0 @@
-package org.drools.runtime.impl;
-
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-import org.drools.command.Context;
-import org.drools.command.impl.GenericCommand;
-
- at XmlRootElement
-public class BatchExecutionImpl implements GenericCommand<Void> {
-
- private static final long serialVersionUID = 1L;
-
- private List<GenericCommand> commands;
-
- private String lookup;
-
- public BatchExecutionImpl() {
- }
-
- public BatchExecutionImpl(List<GenericCommand> commands) {
- this.commands = commands;
- }
-
- public BatchExecutionImpl(List<GenericCommand> commands, String lookup) {
- this.commands = commands;
- this.lookup = lookup;
- }
-
- public List<GenericCommand> getCommands() {
- return commands;
- }
-
- public Void execute(Context context) {
- for ( GenericCommand command : commands ) {
- ((GenericCommand)command).execute( context );
- }
- return null;
- }
-
-}
Copied: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/server (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-core/src/main/java/org/drools/server)
Deleted: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/server/KnowledgeService.java
===================================================================
--- labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-core/src/main/java/org/drools/server/KnowledgeService.java 2010-04-05 15:42:54 UTC (rev 32414)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/server/KnowledgeService.java 2010-04-05 18:10:57 UTC (rev 32421)
@@ -1,9 +0,0 @@
-package org.drools.server;
-
-import org.drools.CheckedDroolsException;
-
-public interface KnowledgeService {
-
- public String executeCommand(String cmd) throws CheckedDroolsException;
-
-}
Copied: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/server/KnowledgeService.java (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-core/src/main/java/org/drools/server/KnowledgeService.java)
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/server/KnowledgeService.java (rev 0)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/server/KnowledgeService.java 2010-04-05 18:10:57 UTC (rev 32421)
@@ -0,0 +1,9 @@
+package org.drools.server;
+
+import org.drools.CheckedDroolsException;
+
+public interface KnowledgeService {
+
+ public String executeCommand(String cmd) throws CheckedDroolsException;
+
+}
Copied: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/server/profile (from rev 32420, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-core/src/main/java/org/drools/server/profile)
Deleted: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/server/profile/KnowledgeServiceConfiguration.java
===================================================================
--- labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-core/src/main/java/org/drools/server/profile/KnowledgeServiceConfiguration.java 2010-04-05 16:42:59 UTC (rev 32420)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/server/profile/KnowledgeServiceConfiguration.java 2010-04-05 18:10:57 UTC (rev 32421)
@@ -1,78 +0,0 @@
-package org.drools.server.profile;
-
-import java.util.List;
-
-import javax.xml.bind.JAXBContext;
-
-import org.drools.runtime.CommandExecutor;
-
-public class KnowledgeServiceConfiguration {
-
- private String id;
- private CommandExecutor session;
- private String sessionId;
- private String marshaller;
- private JAXBContext context;
- private List<String> commands;
-
- public KnowledgeServiceConfiguration(String id, String sessionId, CommandExecutor session, String marshaller, JAXBContext context, List<String> commands) {
- this.id = id;
- this.sessionId = sessionId;
- this.session = session;
- this.marshaller = marshaller;
- this.context = context;
- this.setCommands(commands);
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getId() {
- return id;
- }
-
- public void setSession(CommandExecutor session) {
- this.session = session;
- }
-
- public CommandExecutor getSession() {
- return session;
- }
-
- public void setSessionId(String sessionId) {
- this.sessionId = sessionId;
- }
-
- public String getSessionId() {
- return sessionId;
- }
-
- public void setMarshaller(String marshaller) {
- this.marshaller = marshaller;
- }
-
- public String getMarshaller() {
- return marshaller;
- }
-
- public void setContext(JAXBContext context) {
- this.context = context;
- }
-
- public JAXBContext getContext() {
- return context;
- }
-
- public void setCommands(List<String> commands) {
- this.commands = commands;
- }
-
- public List<String> getCommands() {
- return commands;
- }
-
-}
-
-
-
Copied: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/server/profile/KnowledgeServiceConfiguration.java (from rev 32420, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-core/src/main/java/org/drools/server/profile/KnowledgeServiceConfiguration.java)
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/server/profile/KnowledgeServiceConfiguration.java (rev 0)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/server/profile/KnowledgeServiceConfiguration.java 2010-04-05 18:10:57 UTC (rev 32421)
@@ -0,0 +1,78 @@
+package org.drools.server.profile;
+
+import java.util.List;
+
+import javax.xml.bind.JAXBContext;
+
+import org.drools.runtime.CommandExecutor;
+
+public class KnowledgeServiceConfiguration {
+
+ private String id;
+ private CommandExecutor session;
+ private String sessionId;
+ private String marshaller;
+ private JAXBContext context;
+ private List<String> commands;
+
+ public KnowledgeServiceConfiguration(String id, String sessionId, CommandExecutor session, String marshaller, JAXBContext context, List<String> commands) {
+ this.id = id;
+ this.sessionId = sessionId;
+ this.session = session;
+ this.marshaller = marshaller;
+ this.context = context;
+ this.setCommands(commands);
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setSession(CommandExecutor session) {
+ this.session = session;
+ }
+
+ public CommandExecutor getSession() {
+ return session;
+ }
+
+ public void setSessionId(String sessionId) {
+ this.sessionId = sessionId;
+ }
+
+ public String getSessionId() {
+ return sessionId;
+ }
+
+ public void setMarshaller(String marshaller) {
+ this.marshaller = marshaller;
+ }
+
+ public String getMarshaller() {
+ return marshaller;
+ }
+
+ public void setContext(JAXBContext context) {
+ this.context = context;
+ }
+
+ public JAXBContext getContext() {
+ return context;
+ }
+
+ public void setCommands(List<String> commands) {
+ this.commands = commands;
+ }
+
+ public List<String> getCommands() {
+ return commands;
+ }
+
+}
+
+
+
Copied: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/xml/jaxb/util/DroolsJaxbContextHelper.java (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-core/src/main/java/org/drools/xml/jaxb/util/DroolsJaxbContextHelper.java)
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/xml/jaxb/util/DroolsJaxbContextHelper.java (rev 0)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/xml/jaxb/util/DroolsJaxbContextHelper.java 2010-04-05 18:10:57 UTC (rev 32421)
@@ -0,0 +1,84 @@
+/*
+ * Copyright 2010 salaboy.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * under the License.
+ */
+package org.drools.xml.jaxb.util;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+
+import org.drools.command.runtime.BatchExecutionCommand;
+import org.drools.command.runtime.GetGlobalCommand;
+import org.drools.command.runtime.SetGlobalCommand;
+import org.drools.command.runtime.process.AbortWorkItemCommand;
+import org.drools.command.runtime.process.SignalEventCommand;
+import org.drools.command.runtime.process.StartProcessCommand;
+import org.drools.command.runtime.rule.FireAllRulesCommand;
+import org.drools.command.runtime.rule.InsertElementsCommand;
+import org.drools.command.runtime.rule.InsertObjectCommand;
+import org.drools.command.runtime.rule.ModifyCommand;
+import org.drools.command.runtime.rule.QueryCommand;
+import org.drools.command.runtime.rule.RetractCommand;
+import org.drools.command.runtime.rule.ModifyCommand.SetterImpl;
+import org.drools.common.DefaultFactHandle;
+import org.drools.common.DisconnectedFactHandle;
+import org.drools.runtime.impl.ExecutionResultImpl;
+import org.drools.runtime.rule.impl.FlatQueryResults;
+
+/**
+ *
+ * @author salaboy
+ */
+public class DroolsJaxbContextHelper {
+
+ public static final String[] JAXB_ANNOTATED_CMD = {BatchExecutionCommand.class.getName(),
+ SetGlobalCommand.class.getName(),
+ GetGlobalCommand.class.getName(),
+ FireAllRulesCommand.class.getName(),
+ InsertElementsCommand.class.getName(),
+ InsertObjectCommand.class.getName(),
+ ModifyCommand.class.getName(),
+ SetterImpl.class.getName(),
+ QueryCommand.class.getName(),
+ RetractCommand.class.getName(),
+ AbortWorkItemCommand.class.getName(),
+ SignalEventCommand.class.getName(),
+ StartProcessCommand.class.getName(),
+ BatchExecutionCommand.class.getName(),
+ ExecutionResultImpl.class.getName(),
+ DefaultFactHandle.class.getName(),
+ JaxbListWrapper.class.getName(),
+ DisconnectedFactHandle.class.getName(),
+ FlatQueryResults.class.getName()
+ };
+
+ public static JAXBContext createDroolsJaxbContext(List<String> classNames, Map<String, ?> properties) throws ClassNotFoundException, JAXBException {
+ int i = 0;
+ Class<?>[] classes = new Class[classNames.size() + JAXB_ANNOTATED_CMD.length];
+
+ for (i = 0; i < classNames.size(); i++) {
+ classes[i] = Class.forName(classNames.get(i));
+ }
+ int j = 0;
+ for (i = classNames.size(); i < classes.length; i++, j++) {
+ classes[i] = Class.forName(JAXB_ANNOTATED_CMD[j]);
+ }
+ return JAXBContext.newInstance(classes, properties);
+
+ }
+}
Modified: labs/jbossrules/trunk/drools-pipeline/drools-camel/src/main/java/org/drools/camel/component/DroolsXStreamDataFormat.java
===================================================================
--- labs/jbossrules/trunk/drools-pipeline/drools-camel/src/main/java/org/drools/camel/component/DroolsXStreamDataFormat.java 2010-04-05 16:42:59 UTC (rev 32420)
+++ labs/jbossrules/trunk/drools-pipeline/drools-camel/src/main/java/org/drools/camel/component/DroolsXStreamDataFormat.java 2010-04-05 18:10:57 UTC (rev 32421)
@@ -19,28 +19,19 @@
import java.io.InputStream;
import java.io.OutputStream;
-import java.io.Reader;
-import java.io.StringReader;
-import javax.xml.parsers.DocumentBuilderFactory;
-
import org.apache.camel.Exchange;
import org.apache.camel.spi.DataFormat;
-import org.drools.command.impl.CommandBasedStatefulKnowledgeSession;
-import org.drools.impl.KnowledgeBaseImpl;
import org.drools.impl.StatefulKnowledgeSessionImpl;
import org.drools.impl.StatelessKnowledgeSessionImpl;
-import org.drools.io.Resource;
import org.drools.reteoo.ReteooRuleBase;
import org.drools.runtime.CommandExecutor;
import org.drools.runtime.help.BatchExecutionHelper;
import org.drools.runtime.pipeline.PipelineContext;
import org.drools.runtime.pipeline.impl.ServiceManagerPipelineContextImpl;
-import org.drools.runtime.pipeline.impl.XStreamFromXmlVsmTransformer;
import org.drools.runtime.pipeline.impl.XStreamResolverStrategy;
import org.drools.vsm.ServiceManager;
import org.w3c.dom.Document;
-import org.xml.sax.InputSource;
import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.io.xml.DomReader;
@@ -51,7 +42,7 @@
*/
public class DroolsXStreamDataFormat implements DataFormat {
private XStreamResolverStrategy xstreamStrategy = null;
- private final XStreamFromXmlVsmTransformer transformer;
+// private final XStreamFromXmlVsmTransformer transformer;
private String charset;
public DroolsXStreamDataFormat() {
@@ -60,7 +51,7 @@
return BatchExecutionHelper.newXStreamMarshaller();
}
};
- this.transformer = new XStreamFromXmlVsmTransformer(xstreamStrategy);
+ //this.transformer = new XStreamFromXmlVsmTransformer(xstreamStrategy);
}
public void marshal(Exchange exchange, Object graph, OutputStream stream)
@@ -71,12 +62,12 @@
xstream.setClassLoader(context.getClassLoader());
String result = null;
- try {
+// try {
result = xstream.toXML(exchange.getIn().getBody());
- } catch (Exception e) {
- // handleException(this, object, e);
- e.printStackTrace();
- }
+// } catch (Exception e) {
+// handleException(this, object, e);
+// e.printStackTrace();
+// }
byte[] bytes;
if (charset != null) {
@@ -97,66 +88,69 @@
// exchange.setProperty("drools-context",this.transformer.getContext()
// );
- PipelineContext context = (PipelineContext) exchange.getProperty("drools-context");
- Document d = exchange.getIn().getBody(Document.class);
- String name = d.getDocumentElement().getAttribute("lookup");
- XStream xstream = this.xstreamStrategy.lookup(name);
- if (xstream == null) {
- throw new IllegalArgumentException(
- "Unable to lookup XStream parser using name '" + name + "'");
- }
- ServiceManagerPipelineContextImpl vsmContext =
- (ServiceManagerPipelineContextImpl) exchange.getProperty("drools-context");
- ServiceManager sm = vsmContext.getServiceManager();
- CommandExecutor executor = sm.lookup(name);
- if (executor == null) {
- throw new IllegalArgumentException("Unable to lookup CommandExecutor using name '" + name + "'");
- }
- vsmContext.setCommandExecutor(executor);
- ClassLoader cl = null;
- if (executor instanceof StatefulKnowledgeSessionImpl) {
- cl = ((ReteooRuleBase) ((StatefulKnowledgeSessionImpl) executor).getRuleBase()).getRootClassLoader();
- xstream.setClassLoader(cl);
- } else if (executor instanceof StatelessKnowledgeSessionImpl) {
- cl = ((ReteooRuleBase) ((StatelessKnowledgeSessionImpl) executor).getRuleBase()).getRootClassLoader();
- } else if (executor instanceof CommandBasedStatefulKnowledgeSession) {
- cl = ((ReteooRuleBase) ((KnowledgeBaseImpl)((CommandBasedStatefulKnowledgeSession) executor).getKnowledgeBase()).getRuleBase()).getRootClassLoader();
- } else {
- throw new IllegalArgumentException("Unable to set ClassLoader on " + executor);
- }
- xstream.setClassLoader(cl);
- vsmContext.setClassLoader(cl);
- Object payload = xstream.unmarshal(new DomReader(d));
+ try {
+ PipelineContext context = (PipelineContext) exchange.getProperty("drools-context");
+ Document d = exchange.getIn().getBody(Document.class);
+ String name = d.getDocumentElement().getAttribute("lookup");
+ XStream xstream = this.xstreamStrategy.lookup(name);
+ if (xstream == null) {
+ throw new IllegalArgumentException(
+ "Unable to lookup XStream parser using name '" + name + "'");
+ }
+ ServiceManagerPipelineContextImpl vsmContext =
+ (ServiceManagerPipelineContextImpl) exchange.getProperty("drools-context");
+ ServiceManager sm = vsmContext.getServiceManager();
+ CommandExecutor executor = sm.lookup(name);
+ if (executor == null) {
+ throw new IllegalArgumentException("Unable to lookup CommandExecutor using name '" + name + "'");
+ }
+ vsmContext.setCommandExecutor(executor);
+ ClassLoader cl = null;
+ if (executor instanceof StatefulKnowledgeSessionImpl) {
+ cl = ((ReteooRuleBase) ((StatefulKnowledgeSessionImpl) executor).getRuleBase()).getRootClassLoader();
+ xstream.setClassLoader(cl);
+ } else if (executor instanceof StatelessKnowledgeSessionImpl) {
+ cl = ((ReteooRuleBase) ((StatelessKnowledgeSessionImpl) executor).getRuleBase()).getRootClassLoader();
+ } else {
+ throw new IllegalArgumentException("Unable to set ClassLoader on " + executor);
+ }
+ xstream.setClassLoader(cl);
+ vsmContext.setClassLoader(cl);
+ Object payload = xstream.unmarshal(new DomReader(d));
- context.getProperties().put("xstream-instance", xstream);
- exchange.setProperty("drools-context", context);
- return payload;
+ context.getProperties().put("xstream-instance", xstream);
+ exchange.setProperty("drools-context", context);
+ return payload;
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw e;
+ }
}
- private Document processTranslate(Object object) {
- // Create a DOM builder and parse the fragment
- DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- Document d = null;
- try {
- d = factory.newDocumentBuilder().parse((InputSource) null);
- } catch (Exception e) {
- }
- try {
- if (object instanceof String) {
- d = factory.newDocumentBuilder().parse(new InputSource(new StringReader((String) object)));
- } else if (object instanceof Reader) {
- d = factory.newDocumentBuilder().parse(new InputSource((Reader) object));
- } else if (object instanceof InputStream) {
- d = factory.newDocumentBuilder().parse((InputStream) object);
- } else if (object instanceof Resource) {
- d = factory.newDocumentBuilder().parse(new InputSource(((Resource) object).getReader()));
- } else {
- throw new IllegalArgumentException("signal object must be instance of InputStream or Resource");
- }
- } catch (Exception e) {
- // handleException(this, object, e);
- e.printStackTrace();
- }
- return d;
- }
-}
+// private Document processTranslate(Object object) {
+// // Create a DOM builder and parse the fragment
+// DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+// Document d = null;
+// try {
+// d = factory.newDocumentBuilder().parse((InputSource) null);
+// } catch (Exception e) {
+// }
+// try {
+// if (object instanceof String) {
+// d = factory.newDocumentBuilder().parse(new InputSource(new StringReader((String) object)));
+// } else if (object instanceof Reader) {
+// d = factory.newDocumentBuilder().parse(new InputSource((Reader) object));
+// } else if (object instanceof InputStream) {
+// d = factory.newDocumentBuilder().parse((InputStream) object);
+// } else if (object instanceof Resource) {
+// d = factory.newDocumentBuilder().parse(new InputSource(((Resource) object).getReader()));
+// } else {
+// throw new IllegalArgumentException("signal object must be instance of InputStream or Resource");
+// }
+// } catch (Exception e) {
+// // handleException(this, object, e);
+// e.printStackTrace();
+// }
+// return d;
+// }
+}
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-pipeline/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointWithJaxbTest.java
===================================================================
--- labs/jbossrules/trunk/drools-pipeline/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointWithJaxbTest.java 2010-04-05 16:42:59 UTC (rev 32420)
+++ labs/jbossrules/trunk/drools-pipeline/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointWithJaxbTest.java 2010-04-05 18:10:57 UTC (rev 32421)
@@ -89,6 +89,8 @@
marshaller.setProperty("jaxb.formatted.output", true);
marshaller.marshal(cmd, xmlReq);
+ System.out.println(xmlReq.toString());
+
byte[] xmlResp = (byte[]) template.requestBodyAndHeader("direct:test-with-session", xmlReq.toString(), "jaxb-context", jaxbContext);
ExecutionResults resp = (ExecutionResults) jaxbContext.createUnmarshaller().unmarshal(new ByteArrayInputStream(xmlResp));
Modified: labs/jbossrules/trunk/drools-pipeline/drools-transformer-jaxb/src/main/java/org/drools/runtime/pipeline/impl/DroolsJaxbHelperProviderImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-pipeline/drools-transformer-jaxb/src/main/java/org/drools/runtime/pipeline/impl/DroolsJaxbHelperProviderImpl.java 2010-04-05 16:42:59 UTC (rev 32420)
+++ labs/jbossrules/trunk/drools-pipeline/drools-transformer-jaxb/src/main/java/org/drools/runtime/pipeline/impl/DroolsJaxbHelperProviderImpl.java 2010-04-05 18:10:57 UTC (rev 32421)
@@ -58,7 +58,6 @@
import org.drools.io.Resource;
import org.drools.lang.descr.PackageDescr;
import org.drools.rule.builder.dialect.java.JavaDialect;
-import org.drools.runtime.impl.BatchExecutionImpl;
import org.drools.runtime.impl.ExecutionResultImpl;
import org.drools.runtime.rule.impl.FlatQueryResults;
import org.drools.xml.jaxb.util.JaxbListWrapper;
@@ -91,7 +90,7 @@
AbortWorkItemCommand.class.getName(),
SignalEventCommand.class.getName(),
StartProcessCommand.class.getName(),
- BatchExecutionImpl.class.getName(),
+ BatchExecutionCommand.class.getName(),
ExecutionResultImpl.class.getName() ,
DefaultFactHandle.class.getName(),
JaxbListWrapper.class.getName(),
Deleted: labs/jbossrules/trunk/drools-server/.project
===================================================================
--- labs/jbossrules/trunk/drools-server/.project 2010-04-05 16:42:59 UTC (rev 32420)
+++ labs/jbossrules/trunk/drools-server/.project 2010-04-05 18:10:57 UTC (rev 32421)
@@ -1,28 +0,0 @@
-<projectDescription>
- <name>drools-server</name>
- <comment>A rule production system</comment>
- <projects>
- <project>drools-api</project>
- <project>drools-compiler</project>
- <project>drools-core</project>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.wst.common.modulecore.ComponentStructuralBuilder</name>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.validation.validationbuilder</name>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.common.modulecore.ComponentStructuralBuilderDependencyResolver</name>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
- </natures>
-</projectDescription>
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-server/drools-server-app (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app)
Property changes on: labs/jbossrules/trunk/drools-server/drools-server-app
___________________________________________________________________
Name: svn:ignore
+ target
Deleted: labs/jbossrules/trunk/drools-server/drools-server-app/pom.xml
===================================================================
--- labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/pom.xml 2010-04-05 15:42:54 UTC (rev 32414)
+++ labs/jbossrules/trunk/drools-server/drools-server-app/pom.xml 2010-04-05 18:10:57 UTC (rev 32421)
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>drools</artifactId>
- <groupId>org.drools</groupId>
- <version>5.1.0.SNAPSHOT</version>
- </parent>
- <artifactId>drools-server-app</artifactId>
- <packaging>war</packaging>
- <name>Drools :: Server App</name>
- <build>
- <finalName>drools-server-app</finalName>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.drools</groupId>
- <artifactId>drools-camel</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.drools</groupId>
- <artifactId>drools-vsm</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.drools</groupId>
- <artifactId>drools-process-task</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.drools</groupId>
- <artifactId>drools-compiler</artifactId>
- </dependency>
- <dependency>
- <groupId>org.drools</groupId>
- <artifactId>drools-server-spring</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.drools</groupId>
- <artifactId>drools-spring</artifactId>
- </dependency>
- <!-- CXF deps -->
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-frontend-jaxws</artifactId>
- <version>2.2.6</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-bundle-jaxrs</artifactId>
- <version>2.2.6</version>
- <exclusions>
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xmlParserAPIs</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.5_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jaxen</groupId>
- <artifactId>jaxen</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.xmlbeans</groupId>
- <artifactId>xmlbeans</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.1</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
- <version>2.5.6</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-vfs</artifactId>
- <version>2.1.3.GA</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.4</version>
- <scope>test</scope>
- </dependency>
-
- <!-- web app deps -->
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
-
- </dependencies>
-
-</project>
Copied: labs/jbossrules/trunk/drools-server/drools-server-app/pom.xml (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/pom.xml)
===================================================================
--- labs/jbossrules/trunk/drools-server/drools-server-app/pom.xml (rev 0)
+++ labs/jbossrules/trunk/drools-server/drools-server-app/pom.xml 2010-04-05 18:10:57 UTC (rev 32421)
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>drools</artifactId>
+ <groupId>org.drools</groupId>
+ <version>5.1.0.SNAPSHOT</version>
+ </parent>
+ <artifactId>drools-server-app</artifactId>
+ <packaging>war</packaging>
+ <name>Drools :: Server App</name>
+ <build>
+ <finalName>drools-server-app</finalName>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.drools</groupId>
+ <artifactId>drools-camel</artifactId>
+ <version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.drools</groupId>
+ <artifactId>drools-vsm</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.drools</groupId>
+ <artifactId>drools-process-task</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.drools</groupId>
+ <artifactId>drools-compiler</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.drools</groupId>
+ <artifactId>drools-server-spring</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.drools</groupId>
+ <artifactId>drools-spring</artifactId>
+ </dependency>
+ <!-- CXF deps -->
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-jaxws</artifactId>
+ <version>2.2.6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-bundle-jaxrs</artifactId>
+ <version>2.2.6</version>
+ <exclusions>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xmlParserAPIs</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.xmlbeans</groupId>
+ <artifactId>xmlbeans</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>3.1</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <version>2.5.6</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-vfs</artifactId>
+ <version>2.1.3.GA</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.4</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- web app deps -->
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+
+ </dependencies>
+
+</project>
Copied: labs/jbossrules/trunk/drools-server/drools-server-app/src (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src)
Copied: labs/jbossrules/trunk/drools-server/drools-server-app/src/main (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src/main)
Copied: labs/jbossrules/trunk/drools-server/drools-server-app/src/main/java (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src/main/java)
Copied: labs/jbossrules/trunk/drools-server/drools-server-app/src/main/java/org (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src/main/java/org)
Copied: labs/jbossrules/trunk/drools-server/drools-server-app/src/main/java/org/apache (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src/main/java/org/apache)
Copied: labs/jbossrules/trunk/drools-server/drools-server-app/src/main/java/org/apache/camel (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src/main/java/org/apache/camel)
Copied: labs/jbossrules/trunk/drools-server/drools-server-app/src/main/java/org/apache/camel/jboss (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src/main/java/org/apache/camel/jboss)
Deleted: labs/jbossrules/trunk/drools-server/drools-server-app/src/main/java/org/apache/camel/jboss/JBossPackageScanClassResolver.java
===================================================================
--- labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src/main/java/org/apache/camel/jboss/JBossPackageScanClassResolver.java 2010-04-05 15:42:54 UTC (rev 32414)
+++ labs/jbossrules/trunk/drools-server/drools-server-app/src/main/java/org/apache/camel/jboss/JBossPackageScanClassResolver.java 2010-04-05 18:10:57 UTC (rev 32421)
@@ -1,81 +0,0 @@
-package org.apache.camel.jboss;
-
-import java.io.IOException;
-import java.net.URL;
-import java.util.Enumeration;
-import java.util.Set;
-
-import org.apache.camel.impl.DefaultPackageScanClassResolver;
-import org.apache.camel.spi.PackageScanFilter;
-import org.jboss.virtual.VFS;
-import org.jboss.virtual.VirtualFile;
-import org.jboss.virtual.VisitorAttributes;
-import org.jboss.virtual.plugins.vfs.helpers.AbstractVirtualFileVisitor;
-
-/**
- * JBoss specific package scan classloader to be used when Camel is running
- * inside JBoss Application Server.
- */
-public class JBossPackageScanClassResolver extends DefaultPackageScanClassResolver {
-
- @Override
- protected void find(PackageScanFilter test, String packageName, ClassLoader loader, Set<Class<?>> classes) {
- if (log.isTraceEnabled()) {
- log.trace("Searching for: " + test + " in package: " + packageName
- + " using classloader: " + loader.getClass().getName());
- }
-
- Enumeration<URL> urls;
- try {
- urls = getResources(loader, packageName);
- if (!urls.hasMoreElements()) {
- log.trace("No URLs returned by classloader");
- }
- }
- catch (IOException ioe) {
- log.warn("Could not read package: " + packageName, ioe);
- return;
- }
-
- while (urls.hasMoreElements()) {
- URL url = null;
- try {
- url = urls.nextElement();
- if (log.isTraceEnabled()) {
- log.trace("URL from classloader: " + url);
- }
- VirtualFile root = VFS.getRoot(url);
- root.visit(new MatchingClassVisitor(test, classes));
- }
- catch (IOException ioe) {
- log.warn("Could not read entries in url: " + url, ioe);
- }
- }
- }
-
- private class MatchingClassVisitor extends AbstractVirtualFileVisitor {
- private PackageScanFilter filter;
- private Set<Class<?>> classes;
-
- private MatchingClassVisitor(PackageScanFilter filter, Set<Class<?>> classes) {
- super(VisitorAttributes.RECURSE_LEAVES_ONLY);
- this.filter = filter;
- this.classes = classes;
- }
-
- public void visit(VirtualFile file) {
- if (file.getName().endsWith(".class")) {
- String fqn = file.getPathName();
- String qn;
- if (fqn.indexOf("jar/") != -1) {
- qn = fqn.substring(fqn.indexOf("jar/") + 4);
- } else {
- qn = fqn.substring(fqn.indexOf("/") + 1);
- }
-
- addIfMatching(filter, qn, classes);
- }
- }
- }
-
-}
Copied: labs/jbossrules/trunk/drools-server/drools-server-app/src/main/java/org/apache/camel/jboss/JBossPackageScanClassResolver.java (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src/main/java/org/apache/camel/jboss/JBossPackageScanClassResolver.java)
===================================================================
--- labs/jbossrules/trunk/drools-server/drools-server-app/src/main/java/org/apache/camel/jboss/JBossPackageScanClassResolver.java (rev 0)
+++ labs/jbossrules/trunk/drools-server/drools-server-app/src/main/java/org/apache/camel/jboss/JBossPackageScanClassResolver.java 2010-04-05 18:10:57 UTC (rev 32421)
@@ -0,0 +1,81 @@
+package org.apache.camel.jboss;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.Enumeration;
+import java.util.Set;
+
+import org.apache.camel.impl.DefaultPackageScanClassResolver;
+import org.apache.camel.spi.PackageScanFilter;
+import org.jboss.virtual.VFS;
+import org.jboss.virtual.VirtualFile;
+import org.jboss.virtual.VisitorAttributes;
+import org.jboss.virtual.plugins.vfs.helpers.AbstractVirtualFileVisitor;
+
+/**
+ * JBoss specific package scan classloader to be used when Camel is running
+ * inside JBoss Application Server.
+ */
+public class JBossPackageScanClassResolver extends DefaultPackageScanClassResolver {
+
+ @Override
+ protected void find(PackageScanFilter test, String packageName, ClassLoader loader, Set<Class<?>> classes) {
+ if (log.isTraceEnabled()) {
+ log.trace("Searching for: " + test + " in package: " + packageName
+ + " using classloader: " + loader.getClass().getName());
+ }
+
+ Enumeration<URL> urls;
+ try {
+ urls = getResources(loader, packageName);
+ if (!urls.hasMoreElements()) {
+ log.trace("No URLs returned by classloader");
+ }
+ }
+ catch (IOException ioe) {
+ log.warn("Could not read package: " + packageName, ioe);
+ return;
+ }
+
+ while (urls.hasMoreElements()) {
+ URL url = null;
+ try {
+ url = urls.nextElement();
+ if (log.isTraceEnabled()) {
+ log.trace("URL from classloader: " + url);
+ }
+ VirtualFile root = VFS.getRoot(url);
+ root.visit(new MatchingClassVisitor(test, classes));
+ }
+ catch (IOException ioe) {
+ log.warn("Could not read entries in url: " + url, ioe);
+ }
+ }
+ }
+
+ private class MatchingClassVisitor extends AbstractVirtualFileVisitor {
+ private PackageScanFilter filter;
+ private Set<Class<?>> classes;
+
+ private MatchingClassVisitor(PackageScanFilter filter, Set<Class<?>> classes) {
+ super(VisitorAttributes.RECURSE_LEAVES_ONLY);
+ this.filter = filter;
+ this.classes = classes;
+ }
+
+ public void visit(VirtualFile file) {
+ if (file.getName().endsWith(".class")) {
+ String fqn = file.getPathName();
+ String qn;
+ if (fqn.indexOf("jar/") != -1) {
+ qn = fqn.substring(fqn.indexOf("jar/") + 4);
+ } else {
+ qn = fqn.substring(fqn.indexOf("/") + 1);
+ }
+
+ addIfMatching(filter, qn, classes);
+ }
+ }
+ }
+
+}
Copied: labs/jbossrules/trunk/drools-server/drools-server-app/src/main/java/org/drools (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src/main/java/org/drools)
Copied: labs/jbossrules/trunk/drools-server/drools-server-app/src/main/java/org/drools/server (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src/main/java/org/drools/server)
Copied: labs/jbossrules/trunk/drools-server/drools-server-app/src/main/java/org/drools/server/service (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src/main/java/org/drools/server/service)
Deleted: labs/jbossrules/trunk/drools-server/drools-server-app/src/main/java/org/drools/server/service/KnowledgeServiceRest.java
===================================================================
--- labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src/main/java/org/drools/server/service/KnowledgeServiceRest.java 2010-04-05 15:42:54 UTC (rev 32414)
+++ labs/jbossrules/trunk/drools-server/drools-server-app/src/main/java/org/drools/server/service/KnowledgeServiceRest.java 2010-04-05 18:10:57 UTC (rev 32421)
@@ -1,55 +0,0 @@
-package org.drools.server.service;
-
-import javax.ws.rs.FormParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.ResponseBuilder;
-import javax.ws.rs.core.Response.Status;
-
-import org.drools.CheckedDroolsException;
-import org.drools.server.KnowledgeService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * RestWS interface to execute commands
- * @author Lucas Amador
- *
- */
- at Path("/rest")
-public class KnowledgeServiceRest {
-
- private static Logger logger = LoggerFactory.getLogger(KnowledgeServiceRest.class);
- private KnowledgeService service;
-
- @POST()
- @Path("/execute")
- public Response execute(@FormParam("command") String command) {
- if (command==null || command.length()==0) {
- logger.error("Invalid or null command " + command);
- return Response.status(Status.BAD_REQUEST).build();
- }
- String response;
- try {
- response = getService().executeCommand(command);
- } catch (CheckedDroolsException e) {
- logger.error(e.getMessage());
- return Response.status(Status.BAD_REQUEST).build();
- } catch (Exception e) {
- logger.error(e.getMessage());
- return Response.status(Status.CONFLICT).build();
- }
- ResponseBuilder builder = Response.ok(response, "application/xml");
- return builder.build();
- }
-
- public void setService(KnowledgeService service) {
- this.service = service;
- }
-
- public KnowledgeService getService() {
- return service;
- }
-
-}
Copied: labs/jbossrules/trunk/drools-server/drools-server-app/src/main/java/org/drools/server/service/KnowledgeServiceRest.java (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src/main/java/org/drools/server/service/KnowledgeServiceRest.java)
===================================================================
--- labs/jbossrules/trunk/drools-server/drools-server-app/src/main/java/org/drools/server/service/KnowledgeServiceRest.java (rev 0)
+++ labs/jbossrules/trunk/drools-server/drools-server-app/src/main/java/org/drools/server/service/KnowledgeServiceRest.java 2010-04-05 18:10:57 UTC (rev 32421)
@@ -0,0 +1,55 @@
+package org.drools.server.service;
+
+import javax.ws.rs.FormParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.ResponseBuilder;
+import javax.ws.rs.core.Response.Status;
+
+import org.drools.CheckedDroolsException;
+import org.drools.server.KnowledgeService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * RestWS interface to execute commands
+ * @author Lucas Amador
+ *
+ */
+ at Path("/rest")
+public class KnowledgeServiceRest {
+
+ private static Logger logger = LoggerFactory.getLogger(KnowledgeServiceRest.class);
+ private KnowledgeService service;
+
+ @POST()
+ @Path("/execute")
+ public Response execute(@FormParam("command") String command) {
+ if (command==null || command.length()==0) {
+ logger.error("Invalid or null command " + command);
+ return Response.status(Status.BAD_REQUEST).build();
+ }
+ String response;
+ try {
+ response = getService().executeCommand(command);
+ } catch (CheckedDroolsException e) {
+ logger.error(e.getMessage());
+ return Response.status(Status.BAD_REQUEST).build();
+ } catch (Exception e) {
+ logger.error(e.getMessage());
+ return Response.status(Status.CONFLICT).build();
+ }
+ ResponseBuilder builder = Response.ok(response, "application/xml");
+ return builder.build();
+ }
+
+ public void setService(KnowledgeService service) {
+ this.service = service;
+ }
+
+ public KnowledgeService getService() {
+ return service;
+ }
+
+}
Deleted: labs/jbossrules/trunk/drools-server/drools-server-app/src/main/java/org/drools/server/service/KnowledgeServiceSoap.java
===================================================================
--- labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src/main/java/org/drools/server/service/KnowledgeServiceSoap.java 2010-04-05 15:42:54 UTC (rev 32414)
+++ labs/jbossrules/trunk/drools-server/drools-server-app/src/main/java/org/drools/server/service/KnowledgeServiceSoap.java 2010-04-05 18:10:57 UTC (rev 32421)
@@ -1,13 +0,0 @@
-package org.drools.server.service;
-
-import javax.jws.WebParam;
-import javax.jws.WebService;
-
-import org.drools.CheckedDroolsException;
-
- at WebService
-public interface KnowledgeServiceSoap {
-
- String execute(@WebParam(name="command") String command) throws CheckedDroolsException;
-
-}
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-server/drools-server-app/src/main/java/org/drools/server/service/KnowledgeServiceSoap.java (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src/main/java/org/drools/server/service/KnowledgeServiceSoap.java)
===================================================================
--- labs/jbossrules/trunk/drools-server/drools-server-app/src/main/java/org/drools/server/service/KnowledgeServiceSoap.java (rev 0)
+++ labs/jbossrules/trunk/drools-server/drools-server-app/src/main/java/org/drools/server/service/KnowledgeServiceSoap.java 2010-04-05 18:10:57 UTC (rev 32421)
@@ -0,0 +1,13 @@
+package org.drools.server.service;
+
+import javax.jws.WebParam;
+import javax.jws.WebService;
+
+import org.drools.CheckedDroolsException;
+
+ at WebService
+public interface KnowledgeServiceSoap {
+
+ String execute(@WebParam(name="command") String command) throws CheckedDroolsException;
+
+}
\ No newline at end of file
Deleted: labs/jbossrules/trunk/drools-server/drools-server-app/src/main/java/org/drools/server/service/KnowledgeServiceSoapImpl.java
===================================================================
--- labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src/main/java/org/drools/server/service/KnowledgeServiceSoapImpl.java 2010-04-05 15:42:54 UTC (rev 32414)
+++ labs/jbossrules/trunk/drools-server/drools-server-app/src/main/java/org/drools/server/service/KnowledgeServiceSoapImpl.java 2010-04-05 18:10:57 UTC (rev 32421)
@@ -1,34 +0,0 @@
-package org.drools.server.service;
-
-import javax.jws.WebService;
-
-import org.drools.CheckedDroolsException;
-import org.drools.server.KnowledgeService;
-
- at WebService(endpointInterface = "org.drools.server.service.KnowledgeServiceSoap", serviceName = "knowledgeService")
-public class KnowledgeServiceSoapImpl implements KnowledgeServiceSoap {
-
- private KnowledgeService service;
-
- public String execute(String command) throws CheckedDroolsException {
- if (command==null || command.length()==0) {
- throw new CheckedDroolsException("Invalid or null command");
- }
- String response = null;
- try {
- response = getService().executeCommand(command);
- } catch (Exception e) {
- throw new CheckedDroolsException(e.getMessage());
- }
- return response;
- }
-
- public void setService(KnowledgeService service) {
- this.service = service;
- }
-
- public KnowledgeService getService() {
- return service;
- }
-
-}
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-server/drools-server-app/src/main/java/org/drools/server/service/KnowledgeServiceSoapImpl.java (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src/main/java/org/drools/server/service/KnowledgeServiceSoapImpl.java)
===================================================================
--- labs/jbossrules/trunk/drools-server/drools-server-app/src/main/java/org/drools/server/service/KnowledgeServiceSoapImpl.java (rev 0)
+++ labs/jbossrules/trunk/drools-server/drools-server-app/src/main/java/org/drools/server/service/KnowledgeServiceSoapImpl.java 2010-04-05 18:10:57 UTC (rev 32421)
@@ -0,0 +1,34 @@
+package org.drools.server.service;
+
+import javax.jws.WebService;
+
+import org.drools.CheckedDroolsException;
+import org.drools.server.KnowledgeService;
+
+ at WebService(endpointInterface = "org.drools.server.service.KnowledgeServiceSoap", serviceName = "knowledgeService")
+public class KnowledgeServiceSoapImpl implements KnowledgeServiceSoap {
+
+ private KnowledgeService service;
+
+ public String execute(String command) throws CheckedDroolsException {
+ if (command==null || command.length()==0) {
+ throw new CheckedDroolsException("Invalid or null command");
+ }
+ String response = null;
+ try {
+ response = getService().executeCommand(command);
+ } catch (Exception e) {
+ throw new CheckedDroolsException(e.getMessage());
+ }
+ return response;
+ }
+
+ public void setService(KnowledgeService service) {
+ this.service = service;
+ }
+
+ public KnowledgeService getService() {
+ return service;
+ }
+
+}
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-server/drools-server-app/src/main/resources (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src/main/resources)
Copied: labs/jbossrules/trunk/drools-server/drools-server-app/src/main/resources/META-INF (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src/main/resources/META-INF)
Copied: labs/jbossrules/trunk/drools-server/drools-server-app/src/main/webapp (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src/main/webapp)
Copied: labs/jbossrules/trunk/drools-server/drools-server-app/src/main/webapp/WEB-INF (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src/main/webapp/WEB-INF)
Deleted: labs/jbossrules/trunk/drools-server/drools-server-app/src/main/webapp/WEB-INF/configuration.xml
===================================================================
--- labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src/main/webapp/WEB-INF/configuration.xml 2010-04-05 15:42:54 UTC (rev 32414)
+++ labs/jbossrules/trunk/drools-server/drools-server-app/src/main/webapp/WEB-INF/configuration.xml 2010-04-05 18:10:57 UTC (rev 32421)
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:context="http://www.springframework.org/schema/context"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd"
- default-autowire="byName">
-
- <import resource="sessions.xml" />
- <import resource="services.xml" />
- <import resource="core.xml" />
-
-</beans>
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-server/drools-server-app/src/main/webapp/WEB-INF/configuration.xml (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src/main/webapp/WEB-INF/configuration.xml)
===================================================================
--- labs/jbossrules/trunk/drools-server/drools-server-app/src/main/webapp/WEB-INF/configuration.xml (rev 0)
+++ labs/jbossrules/trunk/drools-server/drools-server-app/src/main/webapp/WEB-INF/configuration.xml 2010-04-05 18:10:57 UTC (rev 32421)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd"
+ default-autowire="byName">
+
+ <import resource="sessions.xml" />
+ <import resource="services.xml" />
+ <import resource="core.xml" />
+
+</beans>
\ No newline at end of file
Deleted: labs/jbossrules/trunk/drools-server/drools-server-app/src/main/webapp/WEB-INF/core.xml
===================================================================
--- labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src/main/webapp/WEB-INF/core.xml 2010-04-05 15:42:54 UTC (rev 32414)
+++ labs/jbossrules/trunk/drools-server/drools-server-app/src/main/webapp/WEB-INF/core.xml 2010-04-05 18:10:57 UTC (rev 32421)
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:context="http://www.springframework.org/schema/context"
- xmlns:cxf="http://cxf.apache.org/core"
- xmlns:jaxws="http://cxf.apache.org/jaxws"
- xmlns:jaxrs="http://cxf.apache.org/jaxrs"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd
- http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
- http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
- http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd"
- default-autowire="byName">
-
- <!-- Load CXF modules from cxf.jar -->
- <import resource="classpath:META-INF/cxf/cxf.xml" />
- <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
- <import resource="classpath:META-INF/cxf/cxf-extension-jaxrs-binding.xml" />
- <import resource="classpath:META-INF/cxf/cxf-servlet.xml" />
-
- <!-- Here are defined the REST/SOAP services endpoint. You don't need to modify this -->
-
- <bean id="knowledgeServiceSoapImpl" class="org.drools.server.service.KnowledgeServiceSoapImpl">
- <property name="service">
- <ref bean="service" />
- </property>
- </bean>
-
- <!-- Service endpoint -->
- <jaxws:endpoint id="knowledgeServiceSoap"
- implementorClass="org.drools.server.service.KnowledgeServiceSoapImpl"
- implementor="#knowledgeServiceSoapImpl"
- address="/soap">
- </jaxws:endpoint>
-
- <jaxrs:server id="knowledgeServiceRest" address="/">
- <jaxrs:serviceBeans>
- <ref bean="knowledgeServiceRestImpl" />
- </jaxrs:serviceBeans>
- </jaxrs:server>
-
- <bean id="knowledgeServiceRestImpl" class="org.drools.server.service.KnowledgeServiceRest" >
- <property name="service">
- <ref bean="service" />
- </property>
- </bean>
-
-</beans>
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-server/drools-server-app/src/main/webapp/WEB-INF/core.xml (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src/main/webapp/WEB-INF/core.xml)
===================================================================
--- labs/jbossrules/trunk/drools-server/drools-server-app/src/main/webapp/WEB-INF/core.xml (rev 0)
+++ labs/jbossrules/trunk/drools-server/drools-server-app/src/main/webapp/WEB-INF/core.xml 2010-04-05 18:10:57 UTC (rev 32421)
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:jaxrs="http://cxf.apache.org/jaxrs"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd
+ http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
+ http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
+ http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd"
+ default-autowire="byName">
+
+ <!-- Load CXF modules from cxf.jar -->
+ <import resource="classpath:META-INF/cxf/cxf.xml" />
+ <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
+ <import resource="classpath:META-INF/cxf/cxf-extension-jaxrs-binding.xml" />
+ <import resource="classpath:META-INF/cxf/cxf-servlet.xml" />
+
+ <!-- Here are defined the REST/SOAP services endpoint. You don't need to modify this -->
+
+ <bean id="knowledgeServiceSoapImpl" class="org.drools.server.service.KnowledgeServiceSoapImpl">
+ <property name="service">
+ <ref bean="service" />
+ </property>
+ </bean>
+
+ <!-- Service endpoint -->
+ <jaxws:endpoint id="knowledgeServiceSoap"
+ implementorClass="org.drools.server.service.KnowledgeServiceSoapImpl"
+ implementor="#knowledgeServiceSoapImpl"
+ address="/soap">
+ </jaxws:endpoint>
+
+ <jaxrs:server id="knowledgeServiceRest" address="/">
+ <jaxrs:serviceBeans>
+ <ref bean="knowledgeServiceRestImpl" />
+ </jaxrs:serviceBeans>
+ </jaxrs:server>
+
+ <bean id="knowledgeServiceRestImpl" class="org.drools.server.service.KnowledgeServiceRest" >
+ <property name="service">
+ <ref bean="service" />
+ </property>
+ </bean>
+
+</beans>
\ No newline at end of file
Deleted: labs/jbossrules/trunk/drools-server/drools-server-app/src/main/webapp/WEB-INF/services.xml
===================================================================
--- labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src/main/webapp/WEB-INF/services.xml 2010-04-05 15:42:54 UTC (rev 32414)
+++ labs/jbossrules/trunk/drools-server/drools-server-app/src/main/webapp/WEB-INF/services.xml 2010-04-05 18:10:57 UTC (rev 32421)
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:context="http://www.springframework.org/schema/context"
- xmlns:camel="http://camel.apache.org/schema/spring"
- xmlns:drools-service="http://drools.org/schema/drools-service-spring"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd
- http://drools.org/schema/drools-service-spring http://drools.org/schema/drools-service-spring.xsd
- http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd"
- default-autowire="byName">
-
- <!-- Only needed when deployed on JBoss AS 5.X -->
-<!-- <bean id="jbossResolver" class="org.apache.camel.jboss.JBossPackageScanClassResolver"/>-->
-
- <!-- This camel context bean is required -->
- <camelContext id="executionContext" xmlns="http://camel.apache.org/schema/spring" />
-
- <!-- Example service configuration
- <drools-service:configuration id="service-conf-2" marshaller="XSTREAM" session="ksession2" />
- -->
-
- <!-- If you change the service definition id you MUST change this in the core.xml file -->
- <drools-service:definition id="service" smId="sm1" camelContext="executionContext">
- <!-- Here you can add your service configuration
- <drools-service:configuration marshaller="JAXB" session="ksession1">
- <drools-service:class>org.drools.model.Person</drools-service:class>
- </drools-service:configuration> -->
- <!-- or add a reference to an external configuration definition
- <drools-service:configuration-ref id="service-conf-2" />
- -->
- </drools-service:definition>
-
-</beans>
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-server/drools-server-app/src/main/webapp/WEB-INF/services.xml (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src/main/webapp/WEB-INF/services.xml)
===================================================================
--- labs/jbossrules/trunk/drools-server/drools-server-app/src/main/webapp/WEB-INF/services.xml (rev 0)
+++ labs/jbossrules/trunk/drools-server/drools-server-app/src/main/webapp/WEB-INF/services.xml 2010-04-05 18:10:57 UTC (rev 32421)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xmlns:camel="http://camel.apache.org/schema/spring"
+ xmlns:drools-service="http://drools.org/schema/drools-service-spring"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd
+ http://drools.org/schema/drools-service-spring http://drools.org/schema/drools-service-spring.xsd
+ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd"
+ default-autowire="byName">
+
+ <!-- Only needed when deployed on JBoss AS 5.X -->
+<!-- <bean id="jbossResolver" class="org.apache.camel.jboss.JBossPackageScanClassResolver"/>-->
+
+ <!-- This camel context bean is required -->
+ <camelContext id="executionContext" xmlns="http://camel.apache.org/schema/spring" />
+
+ <!-- Example service configuration
+ <drools-service:configuration id="service-conf-2" marshaller="XSTREAM" session="ksession2" />
+ -->
+
+ <!-- If you change the service definition id you MUST change this in the core.xml file -->
+ <drools-service:definition id="service" smId="sm1" camelContext="executionContext">
+ <!-- Here you can add your service configuration
+ <drools-service:configuration marshaller="JAXB" session="ksession1">
+ <drools-service:class>org.drools.model.Person</drools-service:class>
+ </drools-service:configuration> -->
+ <!-- or add a reference to an external configuration definition
+ <drools-service:configuration-ref id="service-conf-2" />
+ -->
+ </drools-service:definition>
+
+</beans>
\ No newline at end of file
Deleted: labs/jbossrules/trunk/drools-server/drools-server-app/src/main/webapp/WEB-INF/sessions.xml
===================================================================
--- labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src/main/webapp/WEB-INF/sessions.xml 2010-04-05 15:42:54 UTC (rev 32414)
+++ labs/jbossrules/trunk/drools-server/drools-server-app/src/main/webapp/WEB-INF/sessions.xml 2010-04-05 18:10:57 UTC (rev 32421)
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:context="http://www.springframework.org/schema/context"
- xmlns:drools="http://drools.org/schema/drools-spring"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd
- http://drools.org/schema/drools-spring http://drools.org/schema/drools-spring.xsd"
- default-autowire="byName">
-
- <!-- Service Manager bean is required -->
- <bean id="sm1" class="org.drools.vsm.local.ServiceManagerLocalClient" />
-
- <!-- Here you define your knowledge base, adding resources and, optionally, an XSD model definition
- <drools:kbase id="kbase1" serviceManager="sm1">
- <drools:resource source="classpath:changesets/change-set-1.xml" type="CHANGE_SET" />
- <drools:model source="classpath:model/person.xsd" />
- </drools:kbase>
-
- <drools:kbase id="kbase2" serviceManager="sm1">
- <drools:resource source="classpath:changesets/change-set-2.xml" type="CHANGE_SET" />
- </drools:kbase>
-
- and create your own stateless/stateful knowledge sessions
-
- <drools:ksession id="ksession1" type="stateful" kbase="kbase1" serviceManager="sm1"/>
-
- <drools:ksession id="ksession2" type="stateless" kbase="kbase2" serviceManager="sm1"/>
- -->
-
-</beans>
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-server/drools-server-app/src/main/webapp/WEB-INF/sessions.xml (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src/main/webapp/WEB-INF/sessions.xml)
===================================================================
--- labs/jbossrules/trunk/drools-server/drools-server-app/src/main/webapp/WEB-INF/sessions.xml (rev 0)
+++ labs/jbossrules/trunk/drools-server/drools-server-app/src/main/webapp/WEB-INF/sessions.xml 2010-04-05 18:10:57 UTC (rev 32421)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xmlns:drools="http://drools.org/schema/drools-spring"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd
+ http://drools.org/schema/drools-spring http://drools.org/schema/drools-spring.xsd"
+ default-autowire="byName">
+
+ <!-- Service Manager bean is required -->
+ <bean id="sm1" class="org.drools.vsm.local.ServiceManagerLocalClient" />
+
+ <!-- Here you define your knowledge base, adding resources and, optionally, an XSD model definition
+ <drools:kbase id="kbase1" serviceManager="sm1">
+ <drools:resource source="classpath:changesets/change-set-1.xml" type="CHANGE_SET" />
+ <drools:model source="classpath:model/person.xsd" />
+ </drools:kbase>
+
+ <drools:kbase id="kbase2" serviceManager="sm1">
+ <drools:resource source="classpath:changesets/change-set-2.xml" type="CHANGE_SET" />
+ </drools:kbase>
+
+ and create your own stateless/stateful knowledge sessions
+
+ <drools:ksession id="ksession1" type="stateful" kbase="kbase1" serviceManager="sm1"/>
+
+ <drools:ksession id="ksession2" type="stateless" kbase="kbase2" serviceManager="sm1"/>
+ -->
+
+</beans>
\ No newline at end of file
Deleted: labs/jbossrules/trunk/drools-server/drools-server-app/src/main/webapp/WEB-INF/web.xml
===================================================================
--- labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src/main/webapp/WEB-INF/web.xml 2010-04-05 15:42:54 UTC (rev 32414)
+++ labs/jbossrules/trunk/drools-server/drools-server-app/src/main/webapp/WEB-INF/web.xml 2010-04-05 18:10:57 UTC (rev 32421)
@@ -1,38 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
-
- <display-name>JBoss Drools Execution Server</display-name>
-
- <context-param>
- <param-name>contextConfigLocation</param-name>
- <param-value>/WEB-INF/configuration.xml</param-value>
- </context-param>
-
- <listener>
- <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
- </listener>
-
- <servlet>
- <servlet-name>knowledgeService</servlet-name>
- <servlet-class>org.drools.server.KnowledgeServiceServlet</servlet-class>
- </servlet>
- <servlet>
- <servlet-name>CXFServlet</servlet-name>
- <servlet-class>org.apache.cxf.transport.servlet.CXFServlet</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>knowledgeService</servlet-name>
- <url-pattern>/servlet/*</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>CXFServlet</servlet-name>
- <url-pattern>/services/*</url-pattern>
- </servlet-mapping>
-
- <session-config>
- <session-timeout>10</session-timeout>
- </session-config>
-
-</web-app>
Copied: labs/jbossrules/trunk/drools-server/drools-server-app/src/main/webapp/WEB-INF/web.xml (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src/main/webapp/WEB-INF/web.xml)
===================================================================
--- labs/jbossrules/trunk/drools-server/drools-server-app/src/main/webapp/WEB-INF/web.xml (rev 0)
+++ labs/jbossrules/trunk/drools-server/drools-server-app/src/main/webapp/WEB-INF/web.xml 2010-04-05 18:10:57 UTC (rev 32421)
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
+<web-app>
+
+ <display-name>JBoss Drools Execution Server</display-name>
+
+ <context-param>
+ <param-name>contextConfigLocation</param-name>
+ <param-value>/WEB-INF/configuration.xml</param-value>
+ </context-param>
+
+ <listener>
+ <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+ </listener>
+
+ <servlet>
+ <servlet-name>knowledgeService</servlet-name>
+ <servlet-class>org.drools.server.KnowledgeServiceServlet</servlet-class>
+ </servlet>
+ <servlet>
+ <servlet-name>CXFServlet</servlet-name>
+ <servlet-class>org.apache.cxf.transport.servlet.CXFServlet</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>knowledgeService</servlet-name>
+ <url-pattern>/servlet/*</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>CXFServlet</servlet-name>
+ <url-pattern>/services/*</url-pattern>
+ </servlet-mapping>
+
+ <session-config>
+ <session-timeout>10</session-timeout>
+ </session-config>
+
+</web-app>
Deleted: labs/jbossrules/trunk/drools-server/drools-server-app/src/main/webapp/index.jsp
===================================================================
--- labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src/main/webapp/index.jsp 2010-04-05 15:42:54 UTC (rev 32414)
+++ labs/jbossrules/trunk/drools-server/drools-server-app/src/main/webapp/index.jsp 2010-04-05 18:10:57 UTC (rev 32421)
@@ -1,9 +0,0 @@
-<%@ page contentType="text/html; charset=UTF-8" %>
-<html>
- <head>
- <title>Drools execution server</title>
- </head>
- <body>
- <h1>Execution server is running</h1>
- </body>
-</html>
Copied: labs/jbossrules/trunk/drools-server/drools-server-app/src/main/webapp/index.jsp (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src/main/webapp/index.jsp)
===================================================================
--- labs/jbossrules/trunk/drools-server/drools-server-app/src/main/webapp/index.jsp (rev 0)
+++ labs/jbossrules/trunk/drools-server/drools-server-app/src/main/webapp/index.jsp 2010-04-05 18:10:57 UTC (rev 32421)
@@ -0,0 +1,9 @@
+<%@ page contentType="text/html; charset=UTF-8" %>
+<html>
+ <head>
+ <title>Drools execution server</title>
+ </head>
+ <body>
+ <h1>Execution server is running</h1>
+ </body>
+</html>
Copied: labs/jbossrules/trunk/drools-server/drools-server-app/src/test (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src/test)
Copied: labs/jbossrules/trunk/drools-server/drools-server-app/src/test/java (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src/test/java)
Copied: labs/jbossrules/trunk/drools-server/drools-server-app/src/test/java/org (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src/test/java/org)
Copied: labs/jbossrules/trunk/drools-server/drools-server-app/src/test/java/org/drools (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src/test/java/org/drools)
Copied: labs/jbossrules/trunk/drools-server/drools-server-app/src/test/java/org/drools/pipeline (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src/test/java/org/drools/pipeline)
Copied: labs/jbossrules/trunk/drools-server/drools-server-app/src/test/java/org/drools/pipeline/camel (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src/test/java/org/drools/pipeline/camel)
Deleted: labs/jbossrules/trunk/drools-server/drools-server-app/src/test/java/org/drools/pipeline/camel/Person.java
===================================================================
--- labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src/test/java/org/drools/pipeline/camel/Person.java 2010-04-05 15:42:54 UTC (rev 32414)
+++ labs/jbossrules/trunk/drools-server/drools-server-app/src/test/java/org/drools/pipeline/camel/Person.java 2010-04-05 18:10:57 UTC (rev 32421)
@@ -1,49 +0,0 @@
-package org.drools.pipeline.camel;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-/**
- *
- * @author salaboy
- */
- at XmlRootElement
-public class Person {
- private String name;
- private Integer age;
-
- public Person() {
- }
-
- public Person(String name) {
- super();
- this.name = name;
- }
-
- public Person(String name, int age) {
- super();
- this.name = name;
- this.age = age;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public void setAge(Integer age) {
- this.age = age;
- }
-
- public Integer getAge() {
- return age;
- }
-
- @Override
- public String toString() {
- return "Person [age=" + age + ", name=" + name + "]";
- }
-
-}
Copied: labs/jbossrules/trunk/drools-server/drools-server-app/src/test/java/org/drools/pipeline/camel/Person.java (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src/test/java/org/drools/pipeline/camel/Person.java)
===================================================================
--- labs/jbossrules/trunk/drools-server/drools-server-app/src/test/java/org/drools/pipeline/camel/Person.java (rev 0)
+++ labs/jbossrules/trunk/drools-server/drools-server-app/src/test/java/org/drools/pipeline/camel/Person.java 2010-04-05 18:10:57 UTC (rev 32421)
@@ -0,0 +1,49 @@
+package org.drools.pipeline.camel;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+/**
+ *
+ * @author salaboy
+ */
+ at XmlRootElement
+public class Person {
+ private String name;
+ private Integer age;
+
+ public Person() {
+ }
+
+ public Person(String name) {
+ super();
+ this.name = name;
+ }
+
+ public Person(String name, int age) {
+ super();
+ this.name = name;
+ this.age = age;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public void setAge(Integer age) {
+ this.age = age;
+ }
+
+ public Integer getAge() {
+ return age;
+ }
+
+ @Override
+ public String toString() {
+ return "Person [age=" + age + ", name=" + name + "]";
+ }
+
+}
Copied: labs/jbossrules/trunk/drools-server/drools-server-app/src/test/java/org/drools/server (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src/test/java/org/drools/server)
Deleted: labs/jbossrules/trunk/drools-server/drools-server-app/src/test/java/org/drools/server/KnowledgeServiceBaseTest.java
===================================================================
--- labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src/test/java/org/drools/server/KnowledgeServiceBaseTest.java 2010-04-05 15:42:54 UTC (rev 32414)
+++ labs/jbossrules/trunk/drools-server/drools-server-app/src/test/java/org/drools/server/KnowledgeServiceBaseTest.java 2010-04-05 18:10:57 UTC (rev 32421)
@@ -1,48 +0,0 @@
-package org.drools.server;
-
-import junit.framework.TestCase;
-
-public abstract class KnowledgeServiceBaseTest extends TestCase {
-
- public String getJaxbCommand() throws Exception {
- String cmd = "";
- cmd += "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n";
- cmd += "<batch-execution lookup='ksession1' xmlns:ns2='http://drools.org/model'>\n";
- cmd += " <insert out-identifier='lucaz'>\n";
- cmd += " <object xsi:type='ns2:person' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>\n";
- cmd += " <ns2:name>lucaz</ns2:name>\n";
- cmd += " <ns2:age>25</ns2:age>\n";
- cmd += " </object>\n";
- cmd += " </insert>\n";
- cmd += " <insert out-identifier='baunax'>\n";
- cmd += " <object xsi:type='ns2:person' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>\n";
- cmd += " <ns2:name>baunax</ns2:name>\n";
- cmd += " <ns2:age>21</ns2:age>\n";
- cmd += " </object>\n";
- cmd += " </insert>\n";
- cmd += " <query name='persons' out-identifier='persons'/>\n";
- cmd += " <fire-all-rules max='-1'/>\n";
- cmd += "</batch-execution>\n";
- return cmd;
- }
-
- public String getXStreamCommand() {
- String cmd = "";
- cmd += "<batch-execution lookup='ksession2'>\n";
- cmd += " <insert out-identifier='baunax'>\n";
- cmd += " <org.drools.pipeline.camel.Person>\n";
- cmd += " <name>baunax</name>\n";
- cmd += " </org.drools.pipeline.camel.Person>\n";
- cmd += " </insert>\n";
- cmd += " <insert out-identifier='lucaz'>\n";
- cmd += " <org.drools.pipeline.camel.Person>\n";
- cmd += " <name>lucaz</name>\n";
- cmd += " </org.drools.pipeline.camel.Person>\n";
- cmd += " </insert>\n";
- cmd += " <query name='persons' out-identifier='persons'/>\n";
- cmd += " <fire-all-rules/>\n";
- cmd += "</batch-execution>\n";
- return cmd;
- }
-
-}
Copied: labs/jbossrules/trunk/drools-server/drools-server-app/src/test/java/org/drools/server/KnowledgeServiceBaseTest.java (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src/test/java/org/drools/server/KnowledgeServiceBaseTest.java)
===================================================================
--- labs/jbossrules/trunk/drools-server/drools-server-app/src/test/java/org/drools/server/KnowledgeServiceBaseTest.java (rev 0)
+++ labs/jbossrules/trunk/drools-server/drools-server-app/src/test/java/org/drools/server/KnowledgeServiceBaseTest.java 2010-04-05 18:10:57 UTC (rev 32421)
@@ -0,0 +1,48 @@
+package org.drools.server;
+
+import junit.framework.TestCase;
+
+public abstract class KnowledgeServiceBaseTest extends TestCase {
+
+ public String getJaxbCommand() throws Exception {
+ String cmd = "";
+ cmd += "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n";
+ cmd += "<batch-execution lookup='ksession1' xmlns:ns2='http://drools.org/model'>\n";
+ cmd += " <insert out-identifier='lucaz'>\n";
+ cmd += " <object xsi:type='ns2:person' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>\n";
+ cmd += " <ns2:name>lucaz</ns2:name>\n";
+ cmd += " <ns2:age>25</ns2:age>\n";
+ cmd += " </object>\n";
+ cmd += " </insert>\n";
+ cmd += " <insert out-identifier='baunax'>\n";
+ cmd += " <object xsi:type='ns2:person' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>\n";
+ cmd += " <ns2:name>baunax</ns2:name>\n";
+ cmd += " <ns2:age>21</ns2:age>\n";
+ cmd += " </object>\n";
+ cmd += " </insert>\n";
+ cmd += " <query name='persons' out-identifier='persons'/>\n";
+ cmd += " <fire-all-rules max='-1'/>\n";
+ cmd += "</batch-execution>\n";
+ return cmd;
+ }
+
+ public String getXStreamCommand() {
+ String cmd = "";
+ cmd += "<batch-execution lookup='ksession2'>\n";
+ cmd += " <insert out-identifier='baunax'>\n";
+ cmd += " <org.drools.pipeline.camel.Person>\n";
+ cmd += " <name>baunax</name>\n";
+ cmd += " </org.drools.pipeline.camel.Person>\n";
+ cmd += " </insert>\n";
+ cmd += " <insert out-identifier='lucaz'>\n";
+ cmd += " <org.drools.pipeline.camel.Person>\n";
+ cmd += " <name>lucaz</name>\n";
+ cmd += " </org.drools.pipeline.camel.Person>\n";
+ cmd += " </insert>\n";
+ cmd += " <query name='persons' out-identifier='persons'/>\n";
+ cmd += " <fire-all-rules/>\n";
+ cmd += "</batch-execution>\n";
+ return cmd;
+ }
+
+}
Copied: labs/jbossrules/trunk/drools-server/drools-server-app/src/test/java/org/drools/server/examples (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src/test/java/org/drools/server/examples)
Copied: labs/jbossrules/trunk/drools-server/drools-server-app/src/test/java/org/drools/server/service (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src/test/java/org/drools/server/service)
Deleted: labs/jbossrules/trunk/drools-server/drools-server-app/src/test/java/org/drools/server/service/KnowledgeServiceRestTest.java
===================================================================
--- labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src/test/java/org/drools/server/service/KnowledgeServiceRestTest.java 2010-04-05 15:42:54 UTC (rev 32414)
+++ labs/jbossrules/trunk/drools-server/drools-server-app/src/test/java/org/drools/server/service/KnowledgeServiceRestTest.java 2010-04-05 18:10:57 UTC (rev 32421)
@@ -1,98 +0,0 @@
-package org.drools.server.service;
-
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-
-import org.drools.runtime.ExecutionResults;
-import org.drools.runtime.help.BatchExecutionHelper;
-import org.drools.runtime.rule.impl.FlatQueryResults;
-import org.drools.server.KnowledgeServiceBaseTest;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
- at RunWith(SpringJUnit4ClassRunner.class)
- at ContextConfiguration(locations = { "classpath:configuration-test.xml" })
-public class KnowledgeServiceRestTest extends KnowledgeServiceBaseTest {
-
- @Autowired
- @Qualifier("knowledgeServiceRestImpl")
- protected KnowledgeServiceRest proxy;
-
- @Test
- public void testInvalidCommand() throws Exception {
- Response response = proxy.execute("asdsad");
- assertEquals(Status.BAD_REQUEST.getStatusCode(), response.getStatus());
- }
-
- @Test
- public void testInvalidProfile() throws Exception {
- Response response = proxy.execute("unknow profile");
- assertEquals(Status.BAD_REQUEST.getStatusCode(), response.getStatus());
- }
-
- @Test
- public void testJaxbInsertCommand() throws Exception {
- String cmd = getJaxbCommand();
-
- Response response = proxy.execute(cmd);
-
- assertEquals(200, response.getStatus());
-
- String XMLoutput = (String) response.getEntity();
-
- assertTrue(XMLoutput.indexOf("<ns2:name>santa</ns2:name>") > -1);
- assertTrue(XMLoutput.indexOf("<item key=\"lucaz\">\n <value xsi:type=\"disconnectedFactHandle\"") > -1);
- assertTrue(XMLoutput.indexOf("<item key=\"baunax\">\n <value xsi:type=\"disconnectedFactHandle\"") > -1);
- }
-
- @Test
- public void testXStreamInsertCommand() throws Exception {
- String cmd = getXStreamCommand();
- Response response = proxy.execute(cmd);
- assertEquals(200, response.getStatus());
-
- String XMLoutput = (String) response.getEntity();
-
- ExecutionResults result = (ExecutionResults) BatchExecutionHelper.newXStreamMarshaller().fromXML(XMLoutput);
-
- assertNotNull(result.getFactHandle("lucaz"));
-
- FlatQueryResults personsQuery = (FlatQueryResults) result.getValue("persons");
- assertEquals(2, personsQuery.size());
- }
-
- @Test
- public void testBothsessions() throws Exception {
- String cmd = getJaxbCommand();
-
- Response response = proxy.execute(cmd);
-
- assertEquals(200, response.getStatus());
-
- String XMLoutput = (String) response.getEntity();
-
- assertTrue(XMLoutput.indexOf("<ns2:name>santa</ns2:name>") > -1);
- assertTrue(XMLoutput.indexOf("<item key=\"lucaz\">\n <value xsi:type=\"disconnectedFactHandle\"") > -1);
- assertTrue(XMLoutput.indexOf("<item key=\"baunax\">\n <value xsi:type=\"disconnectedFactHandle\"") > -1);
-
- cmd = getXStreamCommand();
-
- response = proxy.execute(cmd);
-
- assertEquals(200, response.getStatus());
-
- XMLoutput = (String) response.getEntity();
-
- ExecutionResults result = (ExecutionResults) BatchExecutionHelper.newXStreamMarshaller().fromXML(XMLoutput);
-
- assertNotNull(result.getFactHandle("lucaz"));
-
- FlatQueryResults personsQuery = (FlatQueryResults) result.getValue("persons");
- assertEquals(2, personsQuery.size());
- }
-
-}
Copied: labs/jbossrules/trunk/drools-server/drools-server-app/src/test/java/org/drools/server/service/KnowledgeServiceRestTest.java (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src/test/java/org/drools/server/service/KnowledgeServiceRestTest.java)
===================================================================
--- labs/jbossrules/trunk/drools-server/drools-server-app/src/test/java/org/drools/server/service/KnowledgeServiceRestTest.java (rev 0)
+++ labs/jbossrules/trunk/drools-server/drools-server-app/src/test/java/org/drools/server/service/KnowledgeServiceRestTest.java 2010-04-05 18:10:57 UTC (rev 32421)
@@ -0,0 +1,98 @@
+package org.drools.server.service;
+
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.Status;
+
+import org.drools.runtime.ExecutionResults;
+import org.drools.runtime.help.BatchExecutionHelper;
+import org.drools.runtime.rule.impl.FlatQueryResults;
+import org.drools.server.KnowledgeServiceBaseTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+ at RunWith(SpringJUnit4ClassRunner.class)
+ at ContextConfiguration(locations = { "classpath:configuration-test.xml" })
+public class KnowledgeServiceRestTest extends KnowledgeServiceBaseTest {
+
+ @Autowired
+ @Qualifier("knowledgeServiceRestImpl")
+ protected KnowledgeServiceRest proxy;
+
+ @Test
+ public void testInvalidCommand() throws Exception {
+ Response response = proxy.execute("asdsad");
+ assertEquals(Status.BAD_REQUEST.getStatusCode(), response.getStatus());
+ }
+
+ @Test
+ public void testInvalidProfile() throws Exception {
+ Response response = proxy.execute("unknow profile");
+ assertEquals(Status.BAD_REQUEST.getStatusCode(), response.getStatus());
+ }
+
+ @Test
+ public void testJaxbInsertCommand() throws Exception {
+ String cmd = getJaxbCommand();
+
+ Response response = proxy.execute(cmd);
+
+ assertEquals(200, response.getStatus());
+
+ String XMLoutput = (String) response.getEntity();
+
+ assertTrue(XMLoutput.indexOf("<ns2:name>santa</ns2:name>") > -1);
+ assertTrue(XMLoutput.indexOf("<item key=\"lucaz\">\n <value xsi:type=\"disconnectedFactHandle\"") > -1);
+ assertTrue(XMLoutput.indexOf("<item key=\"baunax\">\n <value xsi:type=\"disconnectedFactHandle\"") > -1);
+ }
+
+ @Test
+ public void testXStreamInsertCommand() throws Exception {
+ String cmd = getXStreamCommand();
+ Response response = proxy.execute(cmd);
+ assertEquals(200, response.getStatus());
+
+ String XMLoutput = (String) response.getEntity();
+
+ ExecutionResults result = (ExecutionResults) BatchExecutionHelper.newXStreamMarshaller().fromXML(XMLoutput);
+
+ assertNotNull(result.getFactHandle("lucaz"));
+
+ FlatQueryResults personsQuery = (FlatQueryResults) result.getValue("persons");
+ assertEquals(2, personsQuery.size());
+ }
+
+ @Test
+ public void testBothsessions() throws Exception {
+ String cmd = getJaxbCommand();
+
+ Response response = proxy.execute(cmd);
+
+ assertEquals(200, response.getStatus());
+
+ String XMLoutput = (String) response.getEntity();
+
+ assertTrue(XMLoutput.indexOf("<ns2:name>santa</ns2:name>") > -1);
+ assertTrue(XMLoutput.indexOf("<item key=\"lucaz\">\n <value xsi:type=\"disconnectedFactHandle\"") > -1);
+ assertTrue(XMLoutput.indexOf("<item key=\"baunax\">\n <value xsi:type=\"disconnectedFactHandle\"") > -1);
+
+ cmd = getXStreamCommand();
+
+ response = proxy.execute(cmd);
+
+ assertEquals(200, response.getStatus());
+
+ XMLoutput = (String) response.getEntity();
+
+ ExecutionResults result = (ExecutionResults) BatchExecutionHelper.newXStreamMarshaller().fromXML(XMLoutput);
+
+ assertNotNull(result.getFactHandle("lucaz"));
+
+ FlatQueryResults personsQuery = (FlatQueryResults) result.getValue("persons");
+ assertEquals(2, personsQuery.size());
+ }
+
+}
Deleted: labs/jbossrules/trunk/drools-server/drools-server-app/src/test/java/org/drools/server/service/KnowledgeServiceSoapTest.java
===================================================================
--- labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src/test/java/org/drools/server/service/KnowledgeServiceSoapTest.java 2010-04-05 15:42:54 UTC (rev 32414)
+++ labs/jbossrules/trunk/drools-server/drools-server-app/src/test/java/org/drools/server/service/KnowledgeServiceSoapTest.java 2010-04-05 18:10:57 UTC (rev 32421)
@@ -1,68 +0,0 @@
-package org.drools.server.service;
-
-import org.drools.runtime.ExecutionResults;
-import org.drools.runtime.help.BatchExecutionHelper;
-import org.drools.runtime.rule.impl.FlatQueryResults;
-import org.drools.server.KnowledgeServiceBaseTest;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
- at RunWith(SpringJUnit4ClassRunner.class)
- at ContextConfiguration(locations = { "classpath:configuration-test.xml" })
-public class KnowledgeServiceSoapTest extends KnowledgeServiceBaseTest {
-
- @Autowired
- @Qualifier("knowledgeServiceSoapImpl")
- protected KnowledgeServiceSoap proxy;
-
- @Test
- public void testJaxbInsertCommand() throws Exception {
- String cmd = getJaxbCommand();
-
- String response = proxy.execute(cmd);
-
- assertTrue(response.indexOf("<ns2:name>santa</ns2:name>") > -1);
- assertTrue(response.indexOf("<item key=\"lucaz\">\n <value xsi:type=\"disconnectedFactHandle\"") > -1);
- assertTrue(response.indexOf("<item key=\"baunax\">\n <value xsi:type=\"disconnectedFactHandle\"") > -1);
- }
-
- @Test
- public void testXStreamInsertCommand() throws Exception {
- String cmd = getXStreamCommand();
- String response = proxy.execute(cmd);
-
- ExecutionResults result = (ExecutionResults) BatchExecutionHelper.newXStreamMarshaller().fromXML(response);
-
- assertNotNull(result.getFactHandle("lucaz"));
-
- FlatQueryResults personsQuery = (FlatQueryResults) result.getValue("persons");
- assertEquals(2, personsQuery.size());
- }
-
- @Test
- public void testBothsessions() throws Exception {
- String cmd = getJaxbCommand();
-
- String response = proxy.execute(cmd);
-
- assertTrue(response.indexOf("<ns2:name>santa</ns2:name>") > -1);
- assertTrue(response.indexOf("<item key=\"lucaz\">\n <value xsi:type=\"disconnectedFactHandle\"") > -1);
- assertTrue(response.indexOf("<item key=\"baunax\">\n <value xsi:type=\"disconnectedFactHandle\"") > -1);
-
- cmd = getXStreamCommand();
-
- response = proxy.execute(cmd);
-
- ExecutionResults result = (ExecutionResults) BatchExecutionHelper.newXStreamMarshaller().fromXML(response);
-
- assertNotNull(result.getFactHandle("lucaz"));
-
- FlatQueryResults personsQuery = (FlatQueryResults) result.getValue("persons");
- assertEquals(2, personsQuery.size());
- }
-
-}
Copied: labs/jbossrules/trunk/drools-server/drools-server-app/src/test/java/org/drools/server/service/KnowledgeServiceSoapTest.java (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src/test/java/org/drools/server/service/KnowledgeServiceSoapTest.java)
===================================================================
--- labs/jbossrules/trunk/drools-server/drools-server-app/src/test/java/org/drools/server/service/KnowledgeServiceSoapTest.java (rev 0)
+++ labs/jbossrules/trunk/drools-server/drools-server-app/src/test/java/org/drools/server/service/KnowledgeServiceSoapTest.java 2010-04-05 18:10:57 UTC (rev 32421)
@@ -0,0 +1,68 @@
+package org.drools.server.service;
+
+import org.drools.runtime.ExecutionResults;
+import org.drools.runtime.help.BatchExecutionHelper;
+import org.drools.runtime.rule.impl.FlatQueryResults;
+import org.drools.server.KnowledgeServiceBaseTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+ at RunWith(SpringJUnit4ClassRunner.class)
+ at ContextConfiguration(locations = { "classpath:configuration-test.xml" })
+public class KnowledgeServiceSoapTest extends KnowledgeServiceBaseTest {
+
+ @Autowired
+ @Qualifier("knowledgeServiceSoapImpl")
+ protected KnowledgeServiceSoap proxy;
+
+ @Test
+ public void testJaxbInsertCommand() throws Exception {
+ String cmd = getJaxbCommand();
+
+ String response = proxy.execute(cmd);
+
+ assertTrue(response.indexOf("<ns2:name>santa</ns2:name>") > -1);
+ assertTrue(response.indexOf("<item key=\"lucaz\">\n <value xsi:type=\"disconnectedFactHandle\"") > -1);
+ assertTrue(response.indexOf("<item key=\"baunax\">\n <value xsi:type=\"disconnectedFactHandle\"") > -1);
+ }
+
+ @Test
+ public void testXStreamInsertCommand() throws Exception {
+ String cmd = getXStreamCommand();
+ String response = proxy.execute(cmd);
+
+ ExecutionResults result = (ExecutionResults) BatchExecutionHelper.newXStreamMarshaller().fromXML(response);
+
+ assertNotNull(result.getFactHandle("lucaz"));
+
+ FlatQueryResults personsQuery = (FlatQueryResults) result.getValue("persons");
+ assertEquals(2, personsQuery.size());
+ }
+
+ @Test
+ public void testBothsessions() throws Exception {
+ String cmd = getJaxbCommand();
+
+ String response = proxy.execute(cmd);
+
+ assertTrue(response.indexOf("<ns2:name>santa</ns2:name>") > -1);
+ assertTrue(response.indexOf("<item key=\"lucaz\">\n <value xsi:type=\"disconnectedFactHandle\"") > -1);
+ assertTrue(response.indexOf("<item key=\"baunax\">\n <value xsi:type=\"disconnectedFactHandle\"") > -1);
+
+ cmd = getXStreamCommand();
+
+ response = proxy.execute(cmd);
+
+ ExecutionResults result = (ExecutionResults) BatchExecutionHelper.newXStreamMarshaller().fromXML(response);
+
+ assertNotNull(result.getFactHandle("lucaz"));
+
+ FlatQueryResults personsQuery = (FlatQueryResults) result.getValue("persons");
+ assertEquals(2, personsQuery.size());
+ }
+
+}
Copied: labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src/test/resources)
Copied: labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/changesets (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src/test/resources/changesets)
Deleted: labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/changesets/change-set-1.xml
===================================================================
--- labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src/test/resources/changesets/change-set-1.xml 2010-04-05 15:42:54 UTC (rev 32414)
+++ labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/changesets/change-set-1.xml 2010-04-05 18:10:57 UTC (rev 32421)
@@ -1,7 +0,0 @@
-<change-set xmlns='http://drools.org/drools-5.0/change-set'
- xmlns:xs='http://www.w3.org/2001/XMLSchema-instance'
- xs:schemaLocation='http://drools.org/drools-5.0/change-set.xsd' >
- <add>
- <resource source='classpath:rules/person.drl' type='DRL' />
- </add>
-</change-set>
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/changesets/change-set-1.xml (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src/test/resources/changesets/change-set-1.xml)
===================================================================
--- labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/changesets/change-set-1.xml (rev 0)
+++ labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/changesets/change-set-1.xml 2010-04-05 18:10:57 UTC (rev 32421)
@@ -0,0 +1,7 @@
+<change-set xmlns='http://drools.org/drools-5.0/change-set'
+ xmlns:xs='http://www.w3.org/2001/XMLSchema-instance'
+ xs:schemaLocation='http://drools.org/drools-5.0/change-set.xsd' >
+ <add>
+ <resource source='classpath:rules/person.drl' type='DRL' />
+ </add>
+</change-set>
\ No newline at end of file
Deleted: labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/changesets/change-set-2.xml
===================================================================
--- labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src/test/resources/changesets/change-set-2.xml 2010-04-05 15:42:54 UTC (rev 32414)
+++ labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/changesets/change-set-2.xml 2010-04-05 18:10:57 UTC (rev 32421)
@@ -1,7 +0,0 @@
-<change-set xmlns='http://drools.org/drools-5.0/change-set'
- xmlns:xs='http://www.w3.org/2001/XMLSchema-instance'
- xs:schemaLocation='http://drools.org/drools-5.0/change-set.xsd'>
- <add>
- <resource source='classpath:rules/person2.drl' type='DRL' />
- </add>
-</change-set>
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/changesets/change-set-2.xml (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src/test/resources/changesets/change-set-2.xml)
===================================================================
--- labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/changesets/change-set-2.xml (rev 0)
+++ labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/changesets/change-set-2.xml 2010-04-05 18:10:57 UTC (rev 32421)
@@ -0,0 +1,7 @@
+<change-set xmlns='http://drools.org/drools-5.0/change-set'
+ xmlns:xs='http://www.w3.org/2001/XMLSchema-instance'
+ xs:schemaLocation='http://drools.org/drools-5.0/change-set.xsd'>
+ <add>
+ <resource source='classpath:rules/person2.drl' type='DRL' />
+ </add>
+</change-set>
\ No newline at end of file
Deleted: labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/configuration-test.xml
===================================================================
--- labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src/test/resources/configuration-test.xml 2010-04-05 15:42:54 UTC (rev 32414)
+++ labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/configuration-test.xml 2010-04-05 18:10:57 UTC (rev 32421)
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:context="http://www.springframework.org/schema/context"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd"
- default-autowire="byName">
-
- <import resource="classpath:sessions-test.xml" />
- <import resource="classpath:services-test.xml" />
- <import resource="classpath:core-test.xml" />
-
-</beans>
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/configuration-test.xml (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src/test/resources/configuration-test.xml)
===================================================================
--- labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/configuration-test.xml (rev 0)
+++ labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/configuration-test.xml 2010-04-05 18:10:57 UTC (rev 32421)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd"
+ default-autowire="byName">
+
+ <import resource="classpath:sessions-test.xml" />
+ <import resource="classpath:services-test.xml" />
+ <import resource="classpath:core-test.xml" />
+
+</beans>
\ No newline at end of file
Deleted: labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/core-test.xml
===================================================================
--- labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src/test/resources/core-test.xml 2010-04-05 15:42:54 UTC (rev 32414)
+++ labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/core-test.xml 2010-04-05 18:10:57 UTC (rev 32421)
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:context="http://www.springframework.org/schema/context"
- xmlns:cxf="http://cxf.apache.org/core"
- xmlns:jaxws="http://cxf.apache.org/jaxws"
- xmlns:jaxrs="http://cxf.apache.org/jaxrs"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd
- http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
- http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
- http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd"
- default-autowire="byName">
-
- <!-- Load CXF modules from cxf.jar -->
- <import resource="classpath:META-INF/cxf/cxf.xml" />
- <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
- <import resource="classpath:META-INF/cxf/cxf-extension-jaxrs-binding.xml" />
- <import resource="classpath:META-INF/cxf/cxf-servlet.xml" />
-
- <bean id="knowledgeServiceSoapImpl" class="org.drools.server.service.KnowledgeServiceSoapImpl">
- <property name="service">
- <ref bean="service" />
- </property>
- </bean>
-
- <!-- Service endpoint -->
- <jaxws:endpoint id="knowledgeServiceSoap"
- implementorClass="org.drools.server.service.KnowledgeServiceSoapImpl"
- implementor="#knowledgeServiceSoapImpl"
- address="/soap">
- </jaxws:endpoint>
-
- <jaxrs:server id="knowledgeServiceRest" address="/">
- <jaxrs:serviceBeans>
- <ref bean="knowledgeServiceRestImpl" />
- </jaxrs:serviceBeans>
- </jaxrs:server>
-
- <bean id="knowledgeServiceRestImpl" class="org.drools.server.service.KnowledgeServiceRest" >
- <property name="service">
- <ref bean="service" />
- </property>
- </bean>
-
-</beans>
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/core-test.xml (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src/test/resources/core-test.xml)
===================================================================
--- labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/core-test.xml (rev 0)
+++ labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/core-test.xml 2010-04-05 18:10:57 UTC (rev 32421)
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:jaxrs="http://cxf.apache.org/jaxrs"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd
+ http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
+ http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
+ http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd"
+ default-autowire="byName">
+
+ <!-- Load CXF modules from cxf.jar -->
+ <import resource="classpath:META-INF/cxf/cxf.xml" />
+ <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
+ <import resource="classpath:META-INF/cxf/cxf-extension-jaxrs-binding.xml" />
+ <import resource="classpath:META-INF/cxf/cxf-servlet.xml" />
+
+ <bean id="knowledgeServiceSoapImpl" class="org.drools.server.service.KnowledgeServiceSoapImpl">
+ <property name="service">
+ <ref bean="service" />
+ </property>
+ </bean>
+
+ <!-- Service endpoint -->
+ <jaxws:endpoint id="knowledgeServiceSoap"
+ implementorClass="org.drools.server.service.KnowledgeServiceSoapImpl"
+ implementor="#knowledgeServiceSoapImpl"
+ address="/soap">
+ </jaxws:endpoint>
+
+ <jaxrs:server id="knowledgeServiceRest" address="/">
+ <jaxrs:serviceBeans>
+ <ref bean="knowledgeServiceRestImpl" />
+ </jaxrs:serviceBeans>
+ </jaxrs:server>
+
+ <bean id="knowledgeServiceRestImpl" class="org.drools.server.service.KnowledgeServiceRest" >
+ <property name="service">
+ <ref bean="service" />
+ </property>
+ </bean>
+
+</beans>
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/model (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src/test/resources/model)
Deleted: labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/model/person.xsd
===================================================================
--- labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src/test/resources/model/person.xsd 2010-04-05 15:42:54 UTC (rev 32414)
+++ labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/model/person.xsd 2010-04-05 18:10:57 UTC (rev 32421)
@@ -1,15 +0,0 @@
-<xsd:schema
- xmlns:person="http://drools.org/model"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://drools.org/model"
- elementFormDefault="qualified"
->
-
- <xsd:complexType name="person">
- <xsd:sequence>
- <xsd:element name="name" type="xsd:string" />
- <xsd:element name="age" type="xsd:integer" />
- </xsd:sequence>
- </xsd:complexType>
-
-</xsd:schema>
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/model/person.xsd (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src/test/resources/model/person.xsd)
===================================================================
--- labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/model/person.xsd (rev 0)
+++ labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/model/person.xsd 2010-04-05 18:10:57 UTC (rev 32421)
@@ -0,0 +1,15 @@
+<xsd:schema
+ xmlns:person="http://drools.org/model"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="http://drools.org/model"
+ elementFormDefault="qualified"
+>
+
+ <xsd:complexType name="person">
+ <xsd:sequence>
+ <xsd:element name="name" type="xsd:string" />
+ <xsd:element name="age" type="xsd:integer" />
+ </xsd:sequence>
+ </xsd:complexType>
+
+</xsd:schema>
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/rules (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src/test/resources/rules)
Deleted: labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/rules/person.drl
===================================================================
--- labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src/test/resources/rules/person.drl 2010-04-05 15:42:54 UTC (rev 32414)
+++ labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/rules/person.drl 2010-04-05 18:10:57 UTC (rev 32421)
@@ -1,14 +0,0 @@
-package org.drools.test.model
-
-import org.drools.model.Person;
-
-query persons
- $p : Person(name != null)
-end
-
-rule "Test Rule 1"
- when
- $p : Person()
- then
- System.out.println("fired " + $p.getName());
-end
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/rules/person.drl (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src/test/resources/rules/person.drl)
===================================================================
--- labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/rules/person.drl (rev 0)
+++ labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/rules/person.drl 2010-04-05 18:10:57 UTC (rev 32421)
@@ -0,0 +1,14 @@
+package org.drools.test.model
+
+import org.drools.model.Person;
+
+query persons
+ $p : Person(name != null)
+end
+
+rule "Test Rule 1"
+ when
+ $p : Person()
+ then
+ System.out.println("fired " + $p.getName());
+end
\ No newline at end of file
Deleted: labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/rules/person2.drl
===================================================================
--- labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src/test/resources/rules/person2.drl 2010-04-05 15:42:54 UTC (rev 32414)
+++ labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/rules/person2.drl 2010-04-05 18:10:57 UTC (rev 32421)
@@ -1,14 +0,0 @@
-package org.drools.test.model
-
-import org.drools.pipeline.camel.Person;
-
-query persons
- $p : Person(name != null)
-end
-
-rule "Test Rule 2"
- when
- $p : Person()
- then
- System.out.println("fired " + $p.getName());
-end
Copied: labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/rules/person2.drl (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src/test/resources/rules/person2.drl)
===================================================================
--- labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/rules/person2.drl (rev 0)
+++ labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/rules/person2.drl 2010-04-05 18:10:57 UTC (rev 32421)
@@ -0,0 +1,14 @@
+package org.drools.test.model
+
+import org.drools.pipeline.camel.Person;
+
+query persons
+ $p : Person(name != null)
+end
+
+rule "Test Rule 2"
+ when
+ $p : Person()
+ then
+ System.out.println("fired " + $p.getName());
+end
Deleted: labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/services-test.xml
===================================================================
--- labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src/test/resources/services-test.xml 2010-04-05 15:42:54 UTC (rev 32414)
+++ labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/services-test.xml 2010-04-05 18:10:57 UTC (rev 32421)
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:context="http://www.springframework.org/schema/context"
- xmlns:camel="http://camel.apache.org/schema/spring"
- xmlns:drools-service="http://drools.org/schema/drools-service-spring"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd
- http://drools.org/schema/drools-service-spring http://drools.org/schema/drools-service-spring.xsd
- http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd"
- default-autowire="byName">
-
- <!-- Only needed to deploy on JBoss AS 5.X -->
-<!-- <bean id="jbossResolver" class="org.apache.camel.jboss.JBossPackageScanClassResolver"/>-->
-
- <!-- This camel context bean is required -->
- <camelContext id="executionContext" xmlns="http://camel.apache.org/schema/spring" />
-
- <drools-service:configuration id="service-conf-2" marshaller="XSTREAM" session="ksession2" />
-
- <drools-service:definition id="service" smId="sm1" camelContext="executionContext">
- <drools-service:configuration marshaller="JAXB" session="ksession1">
- <drools-service:class>org.drools.model.Person</drools-service:class>
- <drools-service:startup-command>
- <![CDATA[
- <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
- <batch-execution lookup="ksession1" xmlns:ns2="http://drools.org/model">
- <insert out-identifier="santa">
- <object xsi:type="ns2:person" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <ns2:name>santa</ns2:name>
- <ns2:age>99</ns2:age>
- </object>
- </insert>
- </batch-execution>
- ]]>
- </drools-service:startup-command>
- </drools-service:configuration>
- <drools-service:configuration-ref id="service-conf-2" />
- </drools-service:definition>
-
-</beans>
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/services-test.xml (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src/test/resources/services-test.xml)
===================================================================
--- labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/services-test.xml (rev 0)
+++ labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/services-test.xml 2010-04-05 18:10:57 UTC (rev 32421)
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xmlns:camel="http://camel.apache.org/schema/spring"
+ xmlns:drools-service="http://drools.org/schema/drools-service-spring"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd
+ http://drools.org/schema/drools-service-spring http://drools.org/schema/drools-service-spring.xsd
+ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd"
+ default-autowire="byName">
+
+ <!-- Only needed to deploy on JBoss AS 5.X -->
+<!-- <bean id="jbossResolver" class="org.apache.camel.jboss.JBossPackageScanClassResolver"/>-->
+
+ <!-- This camel context bean is required -->
+ <camelContext id="executionContext" xmlns="http://camel.apache.org/schema/spring" />
+
+ <drools-service:configuration id="service-conf-2" marshaller="XSTREAM" session="ksession2" />
+
+ <drools-service:definition id="service" smId="sm1" camelContext="executionContext">
+ <drools-service:configuration marshaller="JAXB" session="ksession1">
+ <drools-service:class>org.drools.model.Person</drools-service:class>
+ <drools-service:startup-command>
+ <![CDATA[
+ <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+ <batch-execution lookup="ksession1" xmlns:ns2="http://drools.org/model">
+ <insert out-identifier="santa">
+ <object xsi:type="ns2:person" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <ns2:name>santa</ns2:name>
+ <ns2:age>99</ns2:age>
+ </object>
+ </insert>
+ </batch-execution>
+ ]]>
+ </drools-service:startup-command>
+ </drools-service:configuration>
+ <drools-service:configuration-ref id="service-conf-2" />
+ </drools-service:definition>
+
+</beans>
\ No newline at end of file
Deleted: labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/sessions-test.xml
===================================================================
--- labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src/test/resources/sessions-test.xml 2010-04-05 15:42:54 UTC (rev 32414)
+++ labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/sessions-test.xml 2010-04-05 18:10:57 UTC (rev 32421)
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:context="http://www.springframework.org/schema/context"
- xmlns:drools="http://drools.org/schema/drools-spring"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd
- http://drools.org/schema/drools-spring http://drools.org/schema/drools-spring.xsd"
- default-autowire="byName">
-
- <bean id="sm1" class="org.drools.vsm.local.ServiceManagerLocalClient" />
-
- <drools:kbase id="kbase1" serviceManager="sm1">
- <drools:resource source="classpath:changesets/change-set-1.xml" type="CHANGE_SET" />
- <drools:model source="classpath:model/person.xsd" />
- </drools:kbase>
-
- <drools:kbase id="kbase2" serviceManager="sm1">
- <drools:resource source="classpath:changesets/change-set-2.xml" type="CHANGE_SET" />
- </drools:kbase>
-
- <drools:ksession id="ksession1" type="stateful" kbase="kbase1" serviceManager="sm1"/>
-
- <drools:ksession id="ksession2" type="stateless" kbase="kbase2" serviceManager="sm1"/>
-
-</beans>
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/sessions-test.xml (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-app/src/test/resources/sessions-test.xml)
===================================================================
--- labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/sessions-test.xml (rev 0)
+++ labs/jbossrules/trunk/drools-server/drools-server-app/src/test/resources/sessions-test.xml 2010-04-05 18:10:57 UTC (rev 32421)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xmlns:drools="http://drools.org/schema/drools-spring"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd
+ http://drools.org/schema/drools-spring http://drools.org/schema/drools-spring.xsd"
+ default-autowire="byName">
+
+ <bean id="sm1" class="org.drools.vsm.local.ServiceManagerLocalClient" />
+
+ <drools:kbase id="kbase1" serviceManager="sm1">
+ <drools:resource source="classpath:changesets/change-set-1.xml" type="CHANGE_SET" />
+ <drools:model source="classpath:model/person.xsd" />
+ </drools:kbase>
+
+ <drools:kbase id="kbase2" serviceManager="sm1">
+ <drools:resource source="classpath:changesets/change-set-2.xml" type="CHANGE_SET" />
+ </drools:kbase>
+
+ <drools:ksession id="ksession1" type="stateful" kbase="kbase1" serviceManager="sm1"/>
+
+ <drools:ksession id="ksession2" type="stateless" kbase="kbase2" serviceManager="sm1"/>
+
+</beans>
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-server/drools-server-spring (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-spring)
Property changes on: labs/jbossrules/trunk/drools-server/drools-server-spring
___________________________________________________________________
Name: svn:ignore
+ .settings
target
Deleted: labs/jbossrules/trunk/drools-server/drools-server-spring/pom.xml
===================================================================
--- labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-spring/pom.xml 2010-04-05 15:42:54 UTC (rev 32414)
+++ labs/jbossrules/trunk/drools-server/drools-server-spring/pom.xml 2010-04-05 18:10:57 UTC (rev 32421)
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>drools</artifactId>
- <groupId>org.drools</groupId>
- <version>5.1.0.SNAPSHOT</version>
- </parent>
- <artifactId>drools-server-spring</artifactId>
- <packaging>jar</packaging>
- <name>Drools :: Server Spring</name>
- <build>
- <finalName>drools-server-spring</finalName>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.drools</groupId>
- <artifactId>drools-camel</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.4</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
-</project>
Copied: labs/jbossrules/trunk/drools-server/drools-server-spring/pom.xml (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-spring/pom.xml)
===================================================================
--- labs/jbossrules/trunk/drools-server/drools-server-spring/pom.xml (rev 0)
+++ labs/jbossrules/trunk/drools-server/drools-server-spring/pom.xml 2010-04-05 18:10:57 UTC (rev 32421)
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>drools</artifactId>
+ <groupId>org.drools</groupId>
+ <version>5.1.0.SNAPSHOT</version>
+ </parent>
+ <artifactId>drools-server-spring</artifactId>
+ <packaging>jar</packaging>
+ <name>Drools :: Server Spring</name>
+ <build>
+ <finalName>drools-server-spring</finalName>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.drools</groupId>
+ <artifactId>drools-camel</artifactId>
+ <version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.4</version>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+</project>
Copied: labs/jbossrules/trunk/drools-server/drools-server-spring/src (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-spring/src)
Copied: labs/jbossrules/trunk/drools-server/drools-server-spring/src/main (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-spring/src/main)
Copied: labs/jbossrules/trunk/drools-server/drools-server-spring/src/main/java (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-spring/src/main/java)
Copied: labs/jbossrules/trunk/drools-server/drools-server-spring/src/main/java/org (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-spring/src/main/java/org)
Copied: labs/jbossrules/trunk/drools-server/drools-server-spring/src/main/java/org/drools (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-spring/src/main/java/org/drools)
Copied: labs/jbossrules/trunk/drools-server/drools-server-spring/src/main/java/org/drools/server (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-spring/src/main/java/org/drools/server)
Deleted: labs/jbossrules/trunk/drools-server/drools-server-spring/src/main/java/org/drools/server/KnowledgeServiceImpl.java
===================================================================
--- labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-spring/src/main/java/org/drools/server/KnowledgeServiceImpl.java 2010-04-05 15:42:54 UTC (rev 32414)
+++ labs/jbossrules/trunk/drools-server/drools-server-spring/src/main/java/org/drools/server/KnowledgeServiceImpl.java 2010-04-05 18:10:57 UTC (rev 32421)
@@ -1,128 +0,0 @@
-package org.drools.server;
-
-import java.io.StringReader;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.ProducerTemplate;
-import org.apache.camel.builder.RouteBuilder;
-import org.drools.CheckedDroolsException;
-import org.drools.server.profile.KnowledgeServiceConfiguration;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.w3c.dom.Document;
-import org.xml.sax.InputSource;
-
-/**
- * Service to execute commands
- * @author Lucas Amador
- *
- */
-public class KnowledgeServiceImpl implements KnowledgeService {
-
- private static final Logger LOG = LoggerFactory.getLogger(KnowledgeServiceImpl.class);
-
- private CamelContext camelContext;
- private ProducerTemplate template;
- private Map<String, KnowledgeServiceConfiguration> configurations;
- private String smId;
-
- public KnowledgeServiceImpl(CamelContext camelContext, Map<String, KnowledgeServiceConfiguration> configs, String smId) throws Exception {
- this.camelContext = camelContext;
- this.configurations = configs;
- this.smId = smId;
- this.template = camelContext.createProducerTemplate();
- for (String key : configurations.keySet()) {
- createCamelRoutes(configurations.get(key));
- }
- this.camelContext.start();
- for (String key : configurations.keySet()) {
- executeCommands(configurations.get(key).getCommands());
- }
- }
-
- private void executeCommands(List<String> commands) throws CheckedDroolsException {
- for (String command : commands) {
- executeCommand(command);
- }
- }
-
- public String executeCommand(String cmd) throws CheckedDroolsException {
- String lookup = getLookup(cmd);
- if (lookup==null || lookup.length()==0) {
- LOG.error("Unable to get command lookup attribute: " + lookup);
- throw new CheckedDroolsException("Unable to get command lookup attribute: " + lookup);
- }
- KnowledgeServiceConfiguration serviceConfiguration = configurations.get(lookup);
- if (serviceConfiguration==null) {
- LOG.error("Unable to lookup session: " + lookup);
- throw new CheckedDroolsException("Unable to lookup session: " + lookup);
- }
- if ("JAXB".equals(serviceConfiguration.getMarshaller())) {
- JAXBContext jaxbContext = serviceConfiguration.getContext();
- return new String((byte[])template.requestBodyAndHeader("direct:with-session-jaxb", cmd, "jaxb-context", jaxbContext));
- }
- else if ("XSTREAM".equals(serviceConfiguration.getMarshaller())) {
- return new String((byte[])template.requestBody("direct:with-session-xstream", cmd));
- }
- return null;
- }
-
- private void createCamelRoutes(KnowledgeServiceConfiguration configuration) throws Exception {
- RouteBuilder rb = new RouteBuilder() {
- public void configure() throws Exception {
- }
- };
- if ("JAXB".equals(configuration.getMarshaller())) {
- rb.from("direct:with-session-jaxb").to("drools:" + smId + "/" + configuration.getSessionId() + "?dataFormat=drools-jaxb");
- }
- else if ("XSTREAM".equals(configuration.getMarshaller())) {
- rb.from("direct:with-session-xstream").to("drools:" + smId + "/" + configuration.getSessionId() + "?dataFormat=drools-xstream");
- }
- else {
- throw new IllegalArgumentException("Invalid marshaller value on camel routes creation: " + configuration.getMarshaller());
- }
- camelContext.addRoutes(rb);
- }
-
- private String getLookup(String xml) throws CheckedDroolsException {
- DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- InputSource source = new InputSource(new StringReader(xml));
- Document d = null;
- try {
- d = factory.newDocumentBuilder().parse(source);
- } catch (Exception e) {
- throw new CheckedDroolsException("Error getting lookup: " + e.getMessage(), e);
- }
- return d.getDocumentElement().getAttribute("lookup");
- }
-
- public void setCamelContext(CamelContext camelContext) {
- this.camelContext = camelContext;
- }
-
- public CamelContext getCamelContext() {
- return camelContext;
- }
-
- public void setTemplate(ProducerTemplate template) {
- this.template = template;
- }
-
- public ProducerTemplate getTemplate() {
- return template;
- }
-
- public void setSmId(String smId) {
- this.smId = smId;
- }
-
- public String getSmId() {
- return smId;
- }
-
-}
Copied: labs/jbossrules/trunk/drools-server/drools-server-spring/src/main/java/org/drools/server/KnowledgeServiceImpl.java (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-spring/src/main/java/org/drools/server/KnowledgeServiceImpl.java)
===================================================================
--- labs/jbossrules/trunk/drools-server/drools-server-spring/src/main/java/org/drools/server/KnowledgeServiceImpl.java (rev 0)
+++ labs/jbossrules/trunk/drools-server/drools-server-spring/src/main/java/org/drools/server/KnowledgeServiceImpl.java 2010-04-05 18:10:57 UTC (rev 32421)
@@ -0,0 +1,128 @@
+package org.drools.server;
+
+import java.io.StringReader;
+import java.util.List;
+import java.util.Map;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.parsers.DocumentBuilderFactory;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.ProducerTemplate;
+import org.apache.camel.builder.RouteBuilder;
+import org.drools.CheckedDroolsException;
+import org.drools.server.profile.KnowledgeServiceConfiguration;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+import org.xml.sax.InputSource;
+
+/**
+ * Service to execute commands
+ * @author Lucas Amador
+ *
+ */
+public class KnowledgeServiceImpl implements KnowledgeService {
+
+ private static final Logger LOG = LoggerFactory.getLogger(KnowledgeServiceImpl.class);
+
+ private CamelContext camelContext;
+ private ProducerTemplate template;
+ private Map<String, KnowledgeServiceConfiguration> configurations;
+ private String smId;
+
+ public KnowledgeServiceImpl(CamelContext camelContext, Map<String, KnowledgeServiceConfiguration> configs, String smId) throws Exception {
+ this.camelContext = camelContext;
+ this.configurations = configs;
+ this.smId = smId;
+ this.template = camelContext.createProducerTemplate();
+ for (String key : configurations.keySet()) {
+ createCamelRoutes(configurations.get(key));
+ }
+ this.camelContext.start();
+ for (String key : configurations.keySet()) {
+ executeCommands(configurations.get(key).getCommands());
+ }
+ }
+
+ private void executeCommands(List<String> commands) throws CheckedDroolsException {
+ for (String command : commands) {
+ executeCommand(command);
+ }
+ }
+
+ public String executeCommand(String cmd) throws CheckedDroolsException {
+ String lookup = getLookup(cmd);
+ if (lookup==null || lookup.length()==0) {
+ LOG.error("Unable to get command lookup attribute: " + lookup);
+ throw new CheckedDroolsException("Unable to get command lookup attribute: " + lookup);
+ }
+ KnowledgeServiceConfiguration serviceConfiguration = configurations.get(lookup);
+ if (serviceConfiguration==null) {
+ LOG.error("Unable to lookup session: " + lookup);
+ throw new CheckedDroolsException("Unable to lookup session: " + lookup);
+ }
+ if ("JAXB".equals(serviceConfiguration.getMarshaller())) {
+ JAXBContext jaxbContext = serviceConfiguration.getContext();
+ return new String((byte[])template.requestBodyAndHeader("direct:with-session-jaxb", cmd, "jaxb-context", jaxbContext));
+ }
+ else if ("XSTREAM".equals(serviceConfiguration.getMarshaller())) {
+ return new String((byte[])template.requestBody("direct:with-session-xstream", cmd));
+ }
+ return null;
+ }
+
+ private void createCamelRoutes(KnowledgeServiceConfiguration configuration) throws Exception {
+ RouteBuilder rb = new RouteBuilder() {
+ public void configure() throws Exception {
+ }
+ };
+ if ("JAXB".equals(configuration.getMarshaller())) {
+ rb.from("direct:with-session-jaxb").to("drools:" + smId + "/" + configuration.getSessionId() + "?dataFormat=drools-jaxb");
+ }
+ else if ("XSTREAM".equals(configuration.getMarshaller())) {
+ rb.from("direct:with-session-xstream").to("drools:" + smId + "/" + configuration.getSessionId() + "?dataFormat=drools-xstream");
+ }
+ else {
+ throw new IllegalArgumentException("Invalid marshaller value on camel routes creation: " + configuration.getMarshaller());
+ }
+ camelContext.addRoutes(rb);
+ }
+
+ private String getLookup(String xml) throws CheckedDroolsException {
+ DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+ InputSource source = new InputSource(new StringReader(xml));
+ Document d = null;
+ try {
+ d = factory.newDocumentBuilder().parse(source);
+ } catch (Exception e) {
+ throw new CheckedDroolsException("Error getting lookup: " + e.getMessage(), e);
+ }
+ return d.getDocumentElement().getAttribute("lookup");
+ }
+
+ public void setCamelContext(CamelContext camelContext) {
+ this.camelContext = camelContext;
+ }
+
+ public CamelContext getCamelContext() {
+ return camelContext;
+ }
+
+ public void setTemplate(ProducerTemplate template) {
+ this.template = template;
+ }
+
+ public ProducerTemplate getTemplate() {
+ return template;
+ }
+
+ public void setSmId(String smId) {
+ this.smId = smId;
+ }
+
+ public String getSmId() {
+ return smId;
+ }
+
+}
Copied: labs/jbossrules/trunk/drools-server/drools-server-spring/src/main/resources (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-spring/src/main/resources)
Copied: labs/jbossrules/trunk/drools-server/drools-server-spring/src/main/resources/META-INF (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-spring/src/main/resources/META-INF)
Copied: labs/jbossrules/trunk/drools-server/drools-server-spring/src/main/webapp (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-spring/src/main/webapp)
Copied: labs/jbossrules/trunk/drools-server/drools-server-spring/src/main/webapp/WEB-INF (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-spring/src/main/webapp/WEB-INF)
Deleted: labs/jbossrules/trunk/drools-server/drools-server-spring/src/main/webapp/WEB-INF/configuration.xml
===================================================================
--- labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-spring/src/main/webapp/WEB-INF/configuration.xml 2010-04-05 15:42:54 UTC (rev 32414)
+++ labs/jbossrules/trunk/drools-server/drools-server-spring/src/main/webapp/WEB-INF/configuration.xml 2010-04-05 18:10:57 UTC (rev 32421)
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:context="http://www.springframework.org/schema/context"
- xmlns:cxf="http://cxf.apache.org/core"
- xmlns:jaxws="http://cxf.apache.org/jaxws"
- xmlns:jaxrs="http://cxf.apache.org/jaxrs"
- xmlns:drools="http://drools.org/schema/drools-spring"
- xmlns:camel="http://camel.apache.org/schema/spring"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd
- http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
- http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
- http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd
- http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
- http://drools.org/schema/drools-spring http://drools.org/schema/drools-spring.xsd"
- default-autowire="byName">
-
- <!-- Load CXF modules from cxf.jar -->
- <import resource="classpath:META-INF/cxf/cxf.xml" />
- <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
- <import resource="classpath:META-INF/cxf/cxf-extension-jaxrs-binding.xml" />
- <import resource="classpath:META-INF/cxf/cxf-servlet.xml" />
-
- <bean id="knowledgeServiceSoapImpl" class="org.drools.server.service.KnowledgeServiceSoapImpl">
- <property name="service">
- <ref local="knowledgeService" />
- </property>
- </bean>
-
- <!-- Service endpoint -->
- <jaxws:endpoint id="knowledgeServiceSoap"
- implementorClass="org.drools.server.service.KnowledgeServiceSoapImpl"
- implementor="#knowledgeServiceSoapImpl"
- address="/soap">
- </jaxws:endpoint>
-
- <jaxrs:server id="knowledgeServiceRest" address="/">
- <jaxrs:serviceBeans>
- <ref bean="knowledgeServiceRestImpl" />
- </jaxrs:serviceBeans>
- </jaxrs:server>
-
- <bean id="knowledgeServiceRestImpl" class="org.drools.server.service.KnowledgeServiceRest" >
- <property name="service">
- <ref local="service" />
- </property>
- </bean>
-
- <
-<!-- <bean id="jbossResolver" class="org.apache.camel.jboss.JBossPackageScanClassResolver" />-->
-
- <camelContext id="executionContext" xmlns="http://camel.apache.org/schema/spring" />
-
-</beans>
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-server/drools-server-spring/src/main/webapp/WEB-INF/configuration.xml (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-spring/src/main/webapp/WEB-INF/configuration.xml)
===================================================================
--- labs/jbossrules/trunk/drools-server/drools-server-spring/src/main/webapp/WEB-INF/configuration.xml (rev 0)
+++ labs/jbossrules/trunk/drools-server/drools-server-spring/src/main/webapp/WEB-INF/configuration.xml 2010-04-05 18:10:57 UTC (rev 32421)
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:jaxrs="http://cxf.apache.org/jaxrs"
+ xmlns:drools="http://drools.org/schema/drools-spring"
+ xmlns:camel="http://camel.apache.org/schema/spring"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd
+ http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
+ http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
+ http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd
+ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
+ http://drools.org/schema/drools-spring http://drools.org/schema/drools-spring.xsd"
+ default-autowire="byName">
+
+ <!-- Load CXF modules from cxf.jar -->
+ <import resource="classpath:META-INF/cxf/cxf.xml" />
+ <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
+ <import resource="classpath:META-INF/cxf/cxf-extension-jaxrs-binding.xml" />
+ <import resource="classpath:META-INF/cxf/cxf-servlet.xml" />
+
+ <bean id="knowledgeServiceSoapImpl" class="org.drools.server.service.KnowledgeServiceSoapImpl">
+ <property name="service">
+ <ref local="knowledgeService" />
+ </property>
+ </bean>
+
+ <!-- Service endpoint -->
+ <jaxws:endpoint id="knowledgeServiceSoap"
+ implementorClass="org.drools.server.service.KnowledgeServiceSoapImpl"
+ implementor="#knowledgeServiceSoapImpl"
+ address="/soap">
+ </jaxws:endpoint>
+
+ <jaxrs:server id="knowledgeServiceRest" address="/">
+ <jaxrs:serviceBeans>
+ <ref bean="knowledgeServiceRestImpl" />
+ </jaxrs:serviceBeans>
+ </jaxrs:server>
+
+ <bean id="knowledgeServiceRestImpl" class="org.drools.server.service.KnowledgeServiceRest" >
+ <property name="service">
+ <ref local="service" />
+ </property>
+ </bean>
+
+ <
+<!-- <bean id="jbossResolver" class="org.apache.camel.jboss.JBossPackageScanClassResolver" />-->
+
+ <camelContext id="executionContext" xmlns="http://camel.apache.org/schema/spring" />
+
+</beans>
\ No newline at end of file
Deleted: labs/jbossrules/trunk/drools-server/drools-server-spring/src/main/webapp/WEB-INF/web.xml
===================================================================
--- labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-spring/src/main/webapp/WEB-INF/web.xml 2010-04-05 15:42:54 UTC (rev 32414)
+++ labs/jbossrules/trunk/drools-server/drools-server-spring/src/main/webapp/WEB-INF/web.xml 2010-04-05 18:10:57 UTC (rev 32421)
@@ -1,38 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
-
- <display-name>JBoss Drools Execution Server</display-name>
-
- <context-param>
- <param-name>contextConfigLocation</param-name>
- <param-value>/WEB-INF/configuration.xml</param-value>
- </context-param>
-
- <listener>
- <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
- </listener>
-
- <servlet>
- <servlet-name>knowledgeService</servlet-name>
- <servlet-class>org.drools.server.KnowledgeServiceServlet</servlet-class>
- </servlet>
- <servlet>
- <servlet-name>CXFServlet</servlet-name>
- <servlet-class>org.apache.cxf.transport.servlet.CXFServlet</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>knowledgeService</servlet-name>
- <url-pattern>/servlet/*</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>CXFServlet</servlet-name>
- <url-pattern>/services/*</url-pattern>
- </servlet-mapping>
-
- <session-config>
- <session-timeout>10</session-timeout>
- </session-config>
-
-</web-app>
Copied: labs/jbossrules/trunk/drools-server/drools-server-spring/src/main/webapp/WEB-INF/web.xml (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-spring/src/main/webapp/WEB-INF/web.xml)
===================================================================
--- labs/jbossrules/trunk/drools-server/drools-server-spring/src/main/webapp/WEB-INF/web.xml (rev 0)
+++ labs/jbossrules/trunk/drools-server/drools-server-spring/src/main/webapp/WEB-INF/web.xml 2010-04-05 18:10:57 UTC (rev 32421)
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
+<web-app>
+
+ <display-name>JBoss Drools Execution Server</display-name>
+
+ <context-param>
+ <param-name>contextConfigLocation</param-name>
+ <param-value>/WEB-INF/configuration.xml</param-value>
+ </context-param>
+
+ <listener>
+ <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+ </listener>
+
+ <servlet>
+ <servlet-name>knowledgeService</servlet-name>
+ <servlet-class>org.drools.server.KnowledgeServiceServlet</servlet-class>
+ </servlet>
+ <servlet>
+ <servlet-name>CXFServlet</servlet-name>
+ <servlet-class>org.apache.cxf.transport.servlet.CXFServlet</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>knowledgeService</servlet-name>
+ <url-pattern>/servlet/*</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>CXFServlet</servlet-name>
+ <url-pattern>/services/*</url-pattern>
+ </servlet-mapping>
+
+ <session-config>
+ <session-timeout>10</session-timeout>
+ </session-config>
+
+</web-app>
Deleted: labs/jbossrules/trunk/drools-server/drools-server-spring/src/main/webapp/index.jsp
===================================================================
--- labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-spring/src/main/webapp/index.jsp 2010-04-05 15:42:54 UTC (rev 32414)
+++ labs/jbossrules/trunk/drools-server/drools-server-spring/src/main/webapp/index.jsp 2010-04-05 18:10:57 UTC (rev 32421)
@@ -1,9 +0,0 @@
-<%@ page contentType="text/html; charset=UTF-8" %>
-<html>
- <head>
- <title>Drools execution server</title>
- </head>
- <body>
- <h1>Execution server is running</h1>
- </body>
-</html>
Copied: labs/jbossrules/trunk/drools-server/drools-server-spring/src/main/webapp/index.jsp (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-spring/src/main/webapp/index.jsp)
===================================================================
--- labs/jbossrules/trunk/drools-server/drools-server-spring/src/main/webapp/index.jsp (rev 0)
+++ labs/jbossrules/trunk/drools-server/drools-server-spring/src/main/webapp/index.jsp 2010-04-05 18:10:57 UTC (rev 32421)
@@ -0,0 +1,9 @@
+<%@ page contentType="text/html; charset=UTF-8" %>
+<html>
+ <head>
+ <title>Drools execution server</title>
+ </head>
+ <body>
+ <h1>Execution server is running</h1>
+ </body>
+</html>
Copied: labs/jbossrules/trunk/drools-server/drools-server-spring/src/test (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-spring/src/test)
Copied: labs/jbossrules/trunk/drools-server/drools-server-spring/src/test/java (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-spring/src/test/java)
Copied: labs/jbossrules/trunk/drools-server/drools-server-spring/src/test/resources (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-spring/src/test/resources)
Copied: labs/jbossrules/trunk/drools-server/drools-server-spring/src/test/resources/model (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-spring/src/test/resources/model)
Deleted: labs/jbossrules/trunk/drools-server/drools-server-spring/src/test/resources/model/person.xsd
===================================================================
--- labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-spring/src/test/resources/model/person.xsd 2010-04-05 15:42:54 UTC (rev 32414)
+++ labs/jbossrules/trunk/drools-server/drools-server-spring/src/test/resources/model/person.xsd 2010-04-05 18:10:57 UTC (rev 32421)
@@ -1,15 +0,0 @@
-<xsd:schema
- xmlns:person="http://drools.org/model"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://drools.org/model"
- elementFormDefault="qualified"
->
-
- <xsd:complexType name="person">
- <xsd:sequence>
- <xsd:element name="name" type="xsd:string" />
- <xsd:element name="age" type="xsd:integer" />
- </xsd:sequence>
- </xsd:complexType>
-
-</xsd:schema>
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-server/drools-server-spring/src/test/resources/model/person.xsd (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-spring/src/test/resources/model/person.xsd)
===================================================================
--- labs/jbossrules/trunk/drools-server/drools-server-spring/src/test/resources/model/person.xsd (rev 0)
+++ labs/jbossrules/trunk/drools-server/drools-server-spring/src/test/resources/model/person.xsd 2010-04-05 18:10:57 UTC (rev 32421)
@@ -0,0 +1,15 @@
+<xsd:schema
+ xmlns:person="http://drools.org/model"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="http://drools.org/model"
+ elementFormDefault="qualified"
+>
+
+ <xsd:complexType name="person">
+ <xsd:sequence>
+ <xsd:element name="name" type="xsd:string" />
+ <xsd:element name="age" type="xsd:integer" />
+ </xsd:sequence>
+ </xsd:complexType>
+
+</xsd:schema>
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-server/drools-server-spring/src/test/resources/rules (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-spring/src/test/resources/rules)
Deleted: labs/jbossrules/trunk/drools-server/drools-server-spring/src/test/resources/rules/person.drl
===================================================================
--- labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-spring/src/test/resources/rules/person.drl 2010-04-05 15:42:54 UTC (rev 32414)
+++ labs/jbossrules/trunk/drools-server/drools-server-spring/src/test/resources/rules/person.drl 2010-04-05 18:10:57 UTC (rev 32421)
@@ -1,14 +0,0 @@
-package org.drools.test.model
-
-import org.drools.model.Person;
-
-query persons
- $p : Person(name != null)
-end
-
-rule "Test Rule 1"
- when
- $p : Person()
- then
- System.out.println("fired " + $p.getName());
-end
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-server/drools-server-spring/src/test/resources/rules/person.drl (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-spring/src/test/resources/rules/person.drl)
===================================================================
--- labs/jbossrules/trunk/drools-server/drools-server-spring/src/test/resources/rules/person.drl (rev 0)
+++ labs/jbossrules/trunk/drools-server/drools-server-spring/src/test/resources/rules/person.drl 2010-04-05 18:10:57 UTC (rev 32421)
@@ -0,0 +1,14 @@
+package org.drools.test.model
+
+import org.drools.model.Person;
+
+query persons
+ $p : Person(name != null)
+end
+
+rule "Test Rule 1"
+ when
+ $p : Person()
+ then
+ System.out.println("fired " + $p.getName());
+end
\ No newline at end of file
Deleted: labs/jbossrules/trunk/drools-server/drools-server-spring/src/test/resources/rules/person2.drl
===================================================================
--- labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-spring/src/test/resources/rules/person2.drl 2010-04-05 15:42:54 UTC (rev 32414)
+++ labs/jbossrules/trunk/drools-server/drools-server-spring/src/test/resources/rules/person2.drl 2010-04-05 18:10:57 UTC (rev 32421)
@@ -1,14 +0,0 @@
-package org.drools.test.model
-
-import org.drools.pipeline.camel.Person;
-
-query persons
- $p : Person(name != null)
-end
-
-rule "Test Rule 2"
- when
- $p : Person()
- then
- System.out.println("fired " + $p.getName());
-end
Copied: labs/jbossrules/trunk/drools-server/drools-server-spring/src/test/resources/rules/person2.drl (from rev 32414, labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/drools-server-spring/src/test/resources/rules/person2.drl)
===================================================================
--- labs/jbossrules/trunk/drools-server/drools-server-spring/src/test/resources/rules/person2.drl (rev 0)
+++ labs/jbossrules/trunk/drools-server/drools-server-spring/src/test/resources/rules/person2.drl 2010-04-05 18:10:57 UTC (rev 32421)
@@ -0,0 +1,14 @@
+package org.drools.test.model
+
+import org.drools.pipeline.camel.Person;
+
+query persons
+ $p : Person(name != null)
+end
+
+rule "Test Rule 2"
+ when
+ $p : Person()
+ then
+ System.out.println("fired " + $p.getName());
+end
Deleted: labs/jbossrules/trunk/drools-server/jboss.identity
===================================================================
--- labs/jbossrules/trunk/drools-server/jboss.identity 2010-04-05 16:42:59 UTC (rev 32420)
+++ labs/jbossrules/trunk/drools-server/jboss.identity 2010-04-05 18:10:57 UTC (rev 32421)
@@ -1 +0,0 @@
-73e4b32acf5b3b94xa9ae05x10c723b5dd1x-7ffe645
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-server/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-server/pom.xml 2010-04-05 16:42:59 UTC (rev 32420)
+++ labs/jbossrules/trunk/drools-server/pom.xml 2010-04-05 18:10:57 UTC (rev 32421)
@@ -1,53 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <!-- README: if you have problems running the build.
- you may need to go up one directory, and run "mvn install" to
- make sure all the deps are ready.
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- If by chance the slackers who maintain the other projects have left the build slight broken,
- you can skip the tests by doing:
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>drools</artifactId>
+ <groupId>org.drools</groupId>
+ <version>5.1.0.SNAPSHOT</version>
+ </parent>
- "mvn -Dmaven.test.skip=true install" and it should work.
-
- -->
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>drools</artifactId>
- <groupId>org.drools</groupId>
- <version>5.1.0.SNAPSHOT</version>
- </parent>
- <artifactId>drools-server</artifactId>
- <packaging>war</packaging>
- <name>Drools :: Server</name>
- <build>
- <finalName>drools-server</finalName>
- </build>
- <dependencies>
- <!-- we are using the most excellent XStream library for fast XML and JSON streaming -->
- <dependency>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- </dependency>
- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax</artifactId>
- <version>1.2.0</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jettison</groupId>
- <artifactId>jettison</artifactId>
- <version>1.0.1</version>
- </dependency>
- <!-- pulling in compiler as we may have to deal with DRLs at some point -->
- <dependency>
- <groupId>org.drools</groupId>
- <artifactId>drools-compiler</artifactId>
- </dependency>
- <!-- now the deps for the web app -->
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
- </dependencies>
-</project>
+ <artifactId>drools-server</artifactId>
+ <packaging>pom</packaging>
+ <name>Drools :: Server</name>
+
+ <modules>
+ <module>drools-server-spring</module>
+ <module>drools-server-app</module>
+ </modules>
+
+</project>
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-vsm/src/main/java/org/drools/vsm/local/ServiceManagerLocalClient.java
===================================================================
--- labs/jbossrules/trunk/drools-vsm/src/main/java/org/drools/vsm/local/ServiceManagerLocalClient.java 2010-04-05 16:42:59 UTC (rev 32420)
+++ labs/jbossrules/trunk/drools-vsm/src/main/java/org/drools/vsm/local/ServiceManagerLocalClient.java 2010-04-05 18:10:57 UTC (rev 32421)
@@ -6,6 +6,7 @@
import org.drools.KnowledgeBase;
import org.drools.KnowledgeBaseFactoryService;
import org.drools.agent.KnowledgeAgentProvider;
+import org.drools.agent.impl.KnowledgeAgentProviderImpl;
import org.drools.builder.DecisionTableConfiguration;
import org.drools.builder.KnowledgeBuilder;
import org.drools.builder.KnowledgeBuilderConfiguration;
@@ -47,8 +48,7 @@
}
public KnowledgeAgentProvider getKnowledgeAgentFactory() {
- // TODO Auto-generated method stub
- return null;
+ return new KnowledgeAgentProviderImpl();
}
public JPAKnowledgeServiceProvider JPAKnowledgeService() {
Modified: labs/jbossrules/trunk/pom.xml
===================================================================
--- labs/jbossrules/trunk/pom.xml 2010-04-05 16:42:59 UTC (rev 32420)
+++ labs/jbossrules/trunk/pom.xml 2010-04-05 18:10:57 UTC (rev 32421)
@@ -918,9 +918,14 @@
</dependency>
<dependency>
<groupId>org.drools</groupId>
- <artifactId>drools-server</artifactId>
+ <artifactId>drools-server-app</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.drools</groupId>
+ <artifactId>drools-server-spring</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.drools</groupId>
<artifactId>drools-vsm</artifactId>
More information about the jboss-svn-commits
mailing list