[jboss-svn-commits] JBL Code SVN: r33389 - in labs/jbossrules/trunk/drools-server: drools-server-app/src/main/webapp/WEB-INF and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Jun 7 20:05:44 EDT 2010
Author: lucazamador
Date: 2010-06-07 20:05:43 -0400 (Mon, 07 Jun 2010)
New Revision: 33389
Modified:
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/KnowledgeServiceSoapImpl.java
labs/jbossrules/trunk/drools-server/drools-server-app/src/main/webapp/WEB-INF/sessions.xml
labs/jbossrules/trunk/drools-server/drools-server-spring/src/main/java/org/drools/server/KnowledgeServiceImpl.java
Log:
JBRULES-2540: drools-server: change exceptions & update config
- done
Modified: 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/KnowledgeServiceRest.java 2010-06-07 23:55:09 UTC (rev 33388)
+++ labs/jbossrules/trunk/drools-server/drools-server-app/src/main/java/org/drools/server/service/KnowledgeServiceRest.java 2010-06-08 00:05:43 UTC (rev 33389)
@@ -7,7 +7,6 @@
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;
@@ -33,7 +32,7 @@
String response;
try {
response = getService().executeCommand( command );
- } catch ( CheckedDroolsException e ) {
+ } catch ( RuntimeException e ) {
logger.error( e.getMessage() );
return Response.status( Status.BAD_REQUEST ).build();
} catch ( Exception e ) {
Modified: 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/java/org/drools/server/service/KnowledgeServiceSoapImpl.java 2010-06-07 23:55:09 UTC (rev 33388)
+++ labs/jbossrules/trunk/drools-server/drools-server-app/src/main/java/org/drools/server/service/KnowledgeServiceSoapImpl.java 2010-06-08 00:05:43 UTC (rev 33389)
@@ -2,7 +2,6 @@
import javax.jws.WebService;
-import org.drools.CheckedDroolsException;
import org.drools.server.KnowledgeService;
@WebService(endpointInterface = "org.drools.server.service.KnowledgeServiceSoap", serviceName = "knowledgeService")
@@ -12,15 +11,15 @@
private KnowledgeService service;
- public String execute(String command) throws CheckedDroolsException {
+ public String execute(String command) throws RuntimeException {
if ( command == null || command.length() == 0 ) {
- throw new CheckedDroolsException( "Invalid or null command" );
+ throw new RuntimeException( "Invalid or null command" );
}
String response = null;
try {
response = getService().executeCommand( command );
} catch ( Exception e ) {
- throw new CheckedDroolsException( e.getMessage() );
+ throw new RuntimeException( e.getMessage() );
}
return response;
}
Modified: 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/sessions.xml 2010-06-07 23:55:09 UTC (rev 33388)
+++ labs/jbossrules/trunk/drools-server/drools-server-app/src/main/webapp/WEB-INF/sessions.xml 2010-06-08 00:05:43 UTC (rev 33389)
@@ -9,24 +9,28 @@
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" />
+ <!-- Grid Connection bean is required -->
+ <drools:connection id="connection1" type="local" />
+
+ <drools:execution-node id="node1" connection="connection1" />
<!-- 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 id="kbase1" node="node1">
+ <drools:resource source="classpath:model/person.xsd" type="XSD">
+ <drools:jaxb-conf system-id="xsd" />
+ </drools:resource>
+ <drools:resource source="classpath:changesets/change-set-1.xml" type="CHANGE_SET" />
</drools:kbase>
- <drools:kbase id="kbase2" serviceManager="sm1">
+ <drools:kbase id="kbase2" node="node1">
<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="ksession1" type="stateful" kbase="kbase1" node="node1"/>
- <drools:ksession id="ksession2" type="stateless" kbase="kbase2" serviceManager="sm1"/>
+ <drools:ksession id="ksession2" type="stateless" kbase="kbase2" node="node1"/>
-->
</beans>
\ No newline at end of file
Modified: 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/java/org/drools/server/KnowledgeServiceImpl.java 2010-06-07 23:55:09 UTC (rev 33388)
+++ labs/jbossrules/trunk/drools-server/drools-server-spring/src/main/java/org/drools/server/KnowledgeServiceImpl.java 2010-06-08 00:05:43 UTC (rev 33389)
@@ -10,7 +10,6 @@
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;
@@ -49,22 +48,22 @@
}
}
- private void executeCommands(List<String> commands) throws CheckedDroolsException {
+ private void executeCommands(List<String> commands) throws RuntimeException {
for ( String command : commands ) {
executeCommand( command );
}
}
- public String executeCommand(String cmd) throws CheckedDroolsException {
+ public String executeCommand(String cmd) throws RuntimeException {
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 );
+ throw new RuntimeException( "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 );
+ throw new RuntimeException( "Unable to lookup session: " + lookup );
}
if ( "JAXB".equals( serviceConfiguration.getMarshaller() ) ) {
JAXBContext jaxbContext = serviceConfiguration.getContext();
@@ -94,14 +93,14 @@
camelContext.addRoutes( rb );
}
- private String getLookup(String xml) throws CheckedDroolsException {
+ private String getLookup(String xml) throws RuntimeException {
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(),
+ throw new RuntimeException( "Error getting lookup: " + e.getMessage(),
e );
}
return d.getDocumentElement().getAttribute( "lookup" );
More information about the jboss-svn-commits
mailing list