[jboss-svn-commits] JBL Code SVN: r31117 - in labs/jbossrules/trunk: drools-api/src/main/java/org/drools and 8 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Jan 18 00:42:16 EST 2010
Author: mark.proctor at jboss.com
Date: 2010-01-18 00:42:15 -0500 (Mon, 18 Jan 2010)
New Revision: 31117
Modified:
labs/jbossrules/trunk/drools-api/META-INF/MANIFEST.MF
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/KnowledgeBaseFactory.java
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/SystemEventListenerFactory.java
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/builder/KnowledgeBuilderFactory.java
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/io/ResourceFactory.java
labs/jbossrules/trunk/drools-compiler/META-INF/MANIFEST.MF
labs/jbossrules/trunk/drools-container/drools-mc/src/main/java/org/drools/mc/io/VFSResourceProvider.java
labs/jbossrules/trunk/drools-container/drools-mc/src/test/java/org/drools/test/mc/io/test/ResourcesTest.java
labs/jbossrules/trunk/drools-core/META-INF/MANIFEST.MF
labs/jbossrules/trunk/drools-decisiontables/META-INF/MANIFEST.MF
labs/jbossrules/trunk/drools-templates/META-INF/MANIFEST.MF
Log:
JBRULES-2351 OSGi Ready
-Getting things compiling again.
Modified: labs/jbossrules/trunk/drools-api/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/drools-api/META-INF/MANIFEST.MF 2010-01-18 05:18:02 UTC (rev 31116)
+++ labs/jbossrules/trunk/drools-api/META-INF/MANIFEST.MF 2010-01-18 05:42:15 UTC (rev 31117)
@@ -9,7 +9,7 @@
:=optional,org.osgi.framework;resolution:=optional;version="1.5",org.
osgi.util.tracker;resolution:=optional;version="1.4",org.quartz;resol
ution:=optional;version="1.6"
-Bnd-LastModified: 1263788844395
+Bnd-LastModified: 1263792610218
Export-Package: org.drools.logger;uses:="org.drools.event";version="5.
1.0.SNAPSHOT",org.drools.runtime;uses:="org.drools.command,org.drools
.time,org.drools.event,org.drools,org.drools.runtime.process,org.droo
@@ -27,7 +27,7 @@
ls.osgi.api;uses:="org.osgi.framework,org.drools,org.drools.util,org.
osgi.util.tracker";version="5.1.0.SNAPSHOT",org.drools;uses:="org.dro
ols.io,org.drools.event.knowledgebase,org.drools.runtime,org.drools.d
- efinition,org.drools.definition.rule,org.drools.definition.type,org.d
+ efinition,org.drools.definition.type,org.drools.definition.rule,org.d
rools.definition.process,org.drools.conf,org.drools.util";version="5.
1.0.SNAPSHOT",org.drools.runtime.conf;uses:="org.drools.conf";version
="5.1.0.SNAPSHOT",org.drools.runtime.process;uses:="org.drools.runtim
@@ -79,4 +79,3 @@
Bundle-SymbolicName: org.drools.api
Tool: Bnd-0.0.357
DynamicImport-Package: *
-
Modified: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/KnowledgeBaseFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/KnowledgeBaseFactory.java 2010-01-18 05:18:02 UTC (rev 31116)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/KnowledgeBaseFactory.java 2010-01-18 05:42:15 UTC (rev 31117)
@@ -36,7 +36,7 @@
* @see org.drools.KnowledgeBase
*/
public class KnowledgeBaseFactory {
- private static KnowledgeBaseFactoryService provider;
+ private static KnowledgeBaseFactoryService factoryService;
/**
* Create a new KnowledgeBase using the default KnowledgeBaseConfiguration
@@ -44,7 +44,7 @@
* The KnowledgeBase
*/
public static KnowledgeBase newKnowledgeBase() {
- return getKnowledgeBaseProvider().newKnowledgeBase();
+ return getKnowledgeBaseFactoryService().newKnowledgeBase();
}
/**
@@ -60,7 +60,7 @@
* The KnowledgeBase
*/
public static KnowledgeBase newKnowledgeBase(String kbaseId) {
- return getKnowledgeBaseProvider().newKnowledgeBase(kbaseId);
+ return getKnowledgeBaseFactoryService().newKnowledgeBase(kbaseId);
}
/**
@@ -69,7 +69,7 @@
* The KnowledgeBase
*/
public static KnowledgeBase newKnowledgeBase(KnowledgeBaseConfiguration conf) {
- return getKnowledgeBaseProvider().newKnowledgeBase( conf );
+ return getKnowledgeBaseFactoryService().newKnowledgeBase( conf );
}
/**
@@ -86,7 +86,7 @@
*/
public static KnowledgeBase newKnowledgeBase(String kbaseId,
KnowledgeBaseConfiguration conf) {
- return getKnowledgeBaseProvider().newKnowledgeBase( kbaseId, conf );
+ return getKnowledgeBaseFactoryService().newKnowledgeBase( kbaseId, conf );
}
/**
@@ -95,7 +95,7 @@
* The KnowledgeBaseConfiguration.
*/
public static KnowledgeBaseConfiguration newKnowledgeBaseConfiguration() {
- return getKnowledgeBaseProvider().newKnowledgeBaseConfiguration();
+ return getKnowledgeBaseFactoryService().newKnowledgeBaseConfiguration();
}
/**
@@ -106,7 +106,7 @@
*/
public static KnowledgeBaseConfiguration newKnowledgeBaseConfiguration(Properties properties,
ClassLoader classLoader) {
- return getKnowledgeBaseProvider().newKnowledgeBaseConfiguration( properties,
+ return getKnowledgeBaseFactoryService().newKnowledgeBaseConfiguration( properties,
classLoader );
}
@@ -116,7 +116,7 @@
* The KnowledgeSessionConfiguration.
*/
public static KnowledgeSessionConfiguration newKnowledgeSessionConfiguration() {
- return getKnowledgeBaseProvider().newKnowledgeSessionConfiguration();
+ return getKnowledgeBaseFactoryService().newKnowledgeSessionConfiguration();
}
/**
@@ -125,33 +125,27 @@
* The KnowledgeSessionConfiguration.
*/
public static KnowledgeSessionConfiguration newKnowledgeSessionConfiguration(Properties properties) {
- return getKnowledgeBaseProvider().newKnowledgeSessionConfiguration( properties );
+ return getKnowledgeBaseFactoryService().newKnowledgeSessionConfiguration( properties );
}
public static Environment newEnvironment() {
- return getKnowledgeBaseProvider().newEnvironment();
+ return getKnowledgeBaseFactoryService().newEnvironment();
}
-// private static synchronized KnowledgeBaseFactoryService getKnowledgeBaseProvider() {
-// if ( provider == null ) {
-// provider = newProviderFor( KnowledgeBaseFactoryService.class );
-// }
-// return provider;
-// }
- private static synchronized void setKnowledgeBaseProvider(KnowledgeBaseFactoryService provider) {
- KnowledgeBaseFactory.provider = provider;
+ private static synchronized void setKnowledgeBaseServiceFactory(KnowledgeBaseFactoryService serviceFactory) {
+ KnowledgeBaseFactory.factoryService = serviceFactory;
}
- private static synchronized KnowledgeBaseFactoryService getKnowledgeBaseProvider() {
- if ( provider == null ) {
- loadProvider();
+ private static synchronized KnowledgeBaseFactoryService getKnowledgeBaseFactoryService() {
+ if ( factoryService == null ) {
+ loadServiceFactory();
}
- return provider;
+ return factoryService;
}
@SuppressWarnings("unchecked")
- private static void loadProvider() {
- setKnowledgeBaseProvider( ServiceRegistryImpl.getInstance().get( KnowledgeBaseFactoryService.class ) );
+ private static void loadServiceFactory() {
+ setKnowledgeBaseServiceFactory( ServiceRegistryImpl.getInstance().get( KnowledgeBaseFactoryService.class ) );
}
}
Modified: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/SystemEventListenerFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/SystemEventListenerFactory.java 2010-01-18 05:18:02 UTC (rev 31116)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/SystemEventListenerFactory.java 2010-01-18 05:42:15 UTC (rev 31117)
@@ -10,7 +10,7 @@
*
*/
public class SystemEventListenerFactory {
- private static SystemEventListenerService provider;
+ private static SystemEventListenerService service;
/**
* Set the SystemEventListener
@@ -18,7 +18,7 @@
* @param listener
*/
public static void setSystemEventListener(SystemEventListener listener) {
- getSystemEventListenerProvider().setSystemEventListener( listener );
+ getSystemEventListenerService().setSystemEventListener( listener );
}
/**
@@ -26,21 +26,21 @@
* @return
*/
public static SystemEventListener getSystemEventListener() {
- return getSystemEventListenerProvider().getSystemEventListener();
+ return getSystemEventListenerService().getSystemEventListener();
}
- private static synchronized void setSystemEventListenerProvider(SystemEventListenerService provider) {
- SystemEventListenerFactory.provider = provider;
+ private static synchronized void setSystemEventListenerService(SystemEventListenerService service) {
+ SystemEventListenerFactory.service = service;
}
- private static synchronized SystemEventListenerService getSystemEventListenerProvider() {
- if ( provider == null ) {
- loadProvider();
+ private static synchronized SystemEventListenerService getSystemEventListenerService() {
+ if ( service == null ) {
+ loadService();
}
- return provider;
+ return service;
}
- private static void loadProvider() {
- setSystemEventListenerProvider( ServiceRegistryImpl.getInstance().get( SystemEventListenerService.class ) );
+ private static void loadService() {
+ setSystemEventListenerService( ServiceRegistryImpl.getInstance().get( SystemEventListenerService.class ) );
}
}
Modified: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/builder/KnowledgeBuilderFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/builder/KnowledgeBuilderFactory.java 2010-01-18 05:18:02 UTC (rev 31116)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/builder/KnowledgeBuilderFactory.java 2010-01-18 05:42:15 UTC (rev 31117)
@@ -18,7 +18,7 @@
*
*/
public class KnowledgeBuilderFactory {
- private static volatile KnowledgeBuilderFactoryService provider;
+ private static volatile KnowledgeBuilderFactoryService factoryService;
/**
* Create and return a new KnowledgeBuilder, using the default KnowledgeBuilderConfigurations
@@ -26,7 +26,7 @@
* The KnowledgeBuilder
*/
public static KnowledgeBuilder newKnowledgeBuilder() {
- return getKnowledgeBuilderProvider().newKnowledgeBuilder();
+ return getKnowledgeBuilderPServiceFactory().newKnowledgeBuilder();
}
/**
@@ -35,16 +35,16 @@
* The KnowledgeBuilder
*/
public static KnowledgeBuilder newKnowledgeBuilder(KnowledgeBuilderConfiguration conf) {
- return getKnowledgeBuilderProvider().newKnowledgeBuilder( conf );
+ return getKnowledgeBuilderPServiceFactory().newKnowledgeBuilder( conf );
}
public static KnowledgeBuilder newKnowledgeBuilder(KnowledgeBase kbase) {
- return getKnowledgeBuilderProvider().newKnowledgeBuilder( kbase );
+ return getKnowledgeBuilderPServiceFactory().newKnowledgeBuilder( kbase );
}
public static KnowledgeBuilder newKnowledgeBuilder(KnowledgeBase kbase,
KnowledgeBuilderConfiguration conf) {
- return getKnowledgeBuilderProvider().newKnowledgeBuilder( kbase,
+ return getKnowledgeBuilderPServiceFactory().newKnowledgeBuilder( kbase,
conf );
}
@@ -54,7 +54,7 @@
* The KnowledgeBuilderConfiguration.
*/
public static KnowledgeBuilderConfiguration newKnowledgeBuilderConfiguration() {
- return getKnowledgeBuilderProvider().newKnowledgeBuilderConfiguration();
+ return getKnowledgeBuilderPServiceFactory().newKnowledgeBuilderConfiguration();
}
/**
@@ -65,7 +65,7 @@
*/
public static KnowledgeBuilderConfiguration newKnowledgeBuilderConfiguration(Properties properties,
ClassLoader classLoader) {
- return getKnowledgeBuilderProvider().newKnowledgeBuilderConfiguration( properties,
+ return getKnowledgeBuilderPServiceFactory().newKnowledgeBuilderConfiguration( properties,
classLoader );
}
@@ -89,21 +89,21 @@
* @return
*/
public static DecisionTableConfiguration newDecisionTableConfiguration() {
- return getKnowledgeBuilderProvider().newDecisionTableConfiguration();
+ return getKnowledgeBuilderPServiceFactory().newDecisionTableConfiguration();
}
- private static synchronized void setKnowledgeBuilderFactoryService(KnowledgeBuilderFactoryService provider) {
- KnowledgeBuilderFactory.provider = provider;
+ private static synchronized void setKnowledgeBuilderFactoryService(KnowledgeBuilderFactoryService serviceFactory) {
+ KnowledgeBuilderFactory.factoryService = serviceFactory;
}
- private static synchronized KnowledgeBuilderFactoryService getKnowledgeBuilderProvider() {
- if ( provider == null ) {
- loadProvider();
+ private static synchronized KnowledgeBuilderFactoryService getKnowledgeBuilderPServiceFactory() {
+ if ( factoryService == null ) {
+ loadServiceFactory();
}
- return provider;
+ return factoryService;
}
- private static void loadProvider() {
+ private static void loadServiceFactory() {
setKnowledgeBuilderFactoryService( ServiceRegistryImpl.getInstance().get( KnowledgeBuilderFactoryService.class ) );
}
}
Modified: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/io/ResourceFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/io/ResourceFactory.java 2010-01-18 05:18:02 UTC (rev 31116)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/io/ResourceFactory.java 2010-01-18 05:42:15 UTC (rev 31117)
@@ -27,7 +27,7 @@
*
*/
public class ResourceFactory {
- private static ResourceFactoryService resourceFactoryService;
+ private static ResourceFactoryService factoryService;
/**
* A Service that can be started, to provide notifications of changed Resources.
@@ -35,7 +35,7 @@
* @return
*/
public static ResourceChangeNotifier getResourceChangeNotifierService() {
- return getResourceProvider().getResourceChangeNotifierService();
+ return getFactoryService().getResourceChangeNotifierService();
}
/**
@@ -44,72 +44,72 @@
* @return
*/
public static ResourceChangeScanner getResourceChangeScannerService() {
- return getResourceProvider().getResourceChangeScannerService();
+ return getFactoryService().getResourceChangeScannerService();
}
public static Resource newUrlResource(URL url) {
- return getResourceProvider().newUrlResource( url );
+ return getFactoryService().newUrlResource( url );
}
public static Resource newUrlResource(String path) {
- return getResourceProvider().newUrlResource( path );
+ return getFactoryService().newUrlResource( path );
}
public static Resource newFileResource(File file) {
- return getResourceProvider().newFileSystemResource( file );
+ return getFactoryService().newFileSystemResource( file );
}
public static Resource newFileResource(String fileName) {
- return getResourceProvider().newFileSystemResource( fileName );
+ return getFactoryService().newFileSystemResource( fileName );
}
public static Resource newByteArrayResource(byte[] bytes) {
- return getResourceProvider().newByteArrayResource( bytes );
+ return getFactoryService().newByteArrayResource( bytes );
}
public static Resource newInputStreamResource(InputStream stream) {
- return getResourceProvider().newInputStreamResource( stream );
+ return getFactoryService().newInputStreamResource( stream );
}
public static Resource newReaderResource(Reader reader) {
- return getResourceProvider().newReaderResource( reader );
+ return getFactoryService().newReaderResource( reader );
}
public static Resource newReaderResource(Reader reader,
String encoding) {
- return getResourceProvider().newReaderResource( reader,
+ return getFactoryService().newReaderResource( reader,
encoding );
}
public static Resource newClassPathResource(String path) {
- return getResourceProvider().newClassPathResource( path );
+ return getFactoryService().newClassPathResource( path );
}
public static Resource newClassPathResource(String path,
Class clazz) {
- return getResourceProvider().newClassPathResource( path,
+ return getFactoryService().newClassPathResource( path,
clazz );
}
public static Resource newClassPathResource(String path,
ClassLoader classLoader) {
- return getResourceProvider().newClassPathResource( path,
+ return getFactoryService().newClassPathResource( path,
classLoader );
}
- private static synchronized void setResourceProvider(ResourceFactoryService provider) {
- ResourceFactory.resourceFactoryService = provider;
+ private static synchronized void setFactoryService(ResourceFactoryService factoryService) {
+ ResourceFactory.factoryService = factoryService;
}
- private static synchronized ResourceFactoryService getResourceProvider() {
- if ( resourceFactoryService == null ) {
- loadProvider();
+ private static synchronized ResourceFactoryService getFactoryService() {
+ if ( factoryService == null ) {
+ loadFactoryService();
}
- return resourceFactoryService;
+ return factoryService;
}
- private static void loadProvider() {
- setResourceProvider( ServiceRegistryImpl.getInstance().get( ResourceFactoryService.class ) );
+ private static void loadFactoryService() {
+ setFactoryService( ServiceRegistryImpl.getInstance().get( ResourceFactoryService.class ) );
}
}
Modified: labs/jbossrules/trunk/drools-compiler/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/drools-compiler/META-INF/MANIFEST.MF 2010-01-18 05:18:02 UTC (rev 31116)
+++ labs/jbossrules/trunk/drools-compiler/META-INF/MANIFEST.MF 2010-01-18 05:42:15 UTC (rev 31117)
@@ -13,11 +13,13 @@
sper;version="3.3",org.eclipse.jdt.internal.compiler.classfmt;provide
r=jasper;version="3.3",org.eclipse.jdt.internal.compiler.env;provider
=jasper;version="3.3",org.eclipse.jdt.internal.compiler.problem;provi
- der=jasper;version="3.3",org.mvel2,org.mvel2.ast,org.mvel2.compiler,o
- rg.mvel2.integration,org.mvel2.integration.impl,org.mvel2.optimizers,
- org.mvel2.templates,org.mvel2.util,org.osgi.framework;version="1.5",o
- rg.w3c.dom,org.xml.sax
-Bnd-LastModified: 1263462737582
+ der=jasper;version="3.3",org.mvel2;version="2.0",org.mvel2.ast;versio
+ n="2.0",org.mvel2.compiler;version="2.0",org.mvel2.integration;versio
+ n="2.0",org.mvel2.integration.impl;version="2.0",org.mvel2.optimizers
+ ;version="2.0",org.mvel2.templates;version="2.0",org.mvel2.util;versi
+ on="2.0",org.osgi.framework;version="1.5",org.osgi.util.tracker;versi
+ on="1.4",org.w3c.dom,org.xml.sax
+Bnd-LastModified: 1263792634654
Export-Package: org.drools.builder.impl;uses:="org.drools.compiler";ve
rsion="5.1.0.SNAPSHOT",org.drools.rule.builder;uses:="org.drools.comp
iler,org.mvel2.compiler,org.mvel2,org.drools.rule.builder.dialect.mve
@@ -28,43 +30,43 @@
m.io.xml,com.thoughtworks.xstream,org.drools.guvnor.client.modeldrive
n,org.mvel2,org.drools.guvnor.client.modeldriven.dt,org.drools.guvnor
.client.modeldriven.testing";version="5.1.0.SNAPSHOT",org.drools.osgi
- .compiler;uses:="org.drools.builder.impl,org.osgi.framework";version=
- "5.1.0.SNAPSHOT",org.drools.guvnor.client.modeldriven.dt;uses:="org.d
- rools.guvnor.client.modeldriven.brl,org.drools.guvnor.client.modeldri
- ven";version="5.1.0.SNAPSHOT",org.drools.process.builder;uses:="org.d
- rools.rule.builder,org.drools.compiler";version="5.1.0.SNAPSHOT",org.
- drools.testframework;uses:="org.drools.guvnor.client.modeldriven.test
- ing,org.mvel2.compiler,org.drools.guvnor.server.util,org.mvel2";versi
- on="5.1.0.SNAPSHOT",org.drools.guvnor.client.modeldriven.ui;version="
- 5.1.0.SNAPSHOT",org.drools.xml.rules;uses:="org.drools.xml,org.xml.sa
- x,org.w3c.dom,org.antlr.runtime.tree,org.antlr.runtime";version="5.1.
- 0.SNAPSHOT",org.drools.guvnor.client;version="5.1.0.SNAPSHOT",org.dro
- ols.guvnor.client.modeldriven;uses:="org.drools.guvnor.client.modeldr
- iven.brl";version="5.1.0.SNAPSHOT",org.drools.reteoo.compiled;uses:="
- org.drools.compiler,org.drools.rule.builder.dialect.java";version="5.
- 1.0.SNAPSHOT",org.drools.xml.processes;uses:="org.drools.xml,org.xml.
- sax,org.w3c.dom,javax.xml.transform.stream,javax.xml.transform";versi
- on="5.1.0.SNAPSHOT",org.drools.rule.builder.dialect.java.parser;uses:
- ="org.antlr.runtime";version="5.1.0.SNAPSHOT",org.drools.semantics.ja
- va.parser;version="5.1.0.SNAPSHOT",org.drools.rule.builder.dialect.ja
- va;uses:="org.drools.rule.builder,org.mvel2.integration,org.mvel2.int
- egration.impl,org.mvel2.templates,org.mvel2.compiler,org.mvel2.optimi
- zers,org.drools.compiler,org.drools.rule.builder.dialect.mvel,org.dro
- ols.rule.builder.dialect.java.parser,org.antlr.runtime,org.mvel2";ver
- sion="5.1.0.SNAPSHOT",org.drools.compiler;uses:="org.drools.rule.buil
- der,org.antlr.runtime.tree,org.antlr.runtime,org.drools.guvnor.server
- .util,org.xml.sax,org.drools.xml,org.drools.guvnor.client.modeldriven
- .brl,org.mvel2,org.drools.process.builder,org.drools.xml.processes";v
- ersion="5.1.0.SNAPSHOT",org.drools.xml;uses:="org.drools.xml.processe
- s,org.drools.xml.rules,org.xml.sax,javax.xml.parsers";version="5.1.0.
- SNAPSHOT",org.drools.rule.builder.dialect.mvel;uses:="org.drools.rule
- .builder,org.drools.compiler,org.mvel2,org.mvel2.compiler,org.mvel2.u
- til,org.drools.rule.builder.dialect.java,org.mvel2.ast";version="5.1.
- 0.SNAPSHOT",org.drools.guvnor.server.rules;uses:="org.drools.guvnor.s
- erver.util,org.drools.compiler,org.drools.guvnor.client.modeldriven";
- version="5.1.0.SNAPSHOT",org.drools.guvnor.client.modeldriven.brl;ver
- sion="5.1.0.SNAPSHOT",org.drools.guvnor.server;version="5.1.0.SNAPSHO
- T"
+ .compiler;uses:="org.osgi.framework,org.osgi.util.tracker,org.drools.
+ compiler,org.drools.builder.impl";version="5.1.0.SNAPSHOT",org.drools
+ .guvnor.client.modeldriven.dt;uses:="org.drools.guvnor.client.modeldr
+ iven.brl,org.drools.guvnor.client.modeldriven";version="5.1.0.SNAPSHO
+ T",org.drools.process.builder;uses:="org.drools.rule.builder,org.droo
+ ls.compiler";version="5.1.0.SNAPSHOT",org.drools.testframework;uses:=
+ "org.drools.guvnor.client.modeldriven.testing,org.mvel2.compiler,org.
+ drools.guvnor.server.util,org.mvel2";version="5.1.0.SNAPSHOT",org.dro
+ ols.guvnor.client.modeldriven.ui;version="5.1.0.SNAPSHOT",org.drools.
+ xml.rules;uses:="org.drools.xml,org.xml.sax,org.w3c.dom,org.antlr.run
+ time.tree,org.antlr.runtime";version="5.1.0.SNAPSHOT",org.drools.guvn
+ or.client;version="5.1.0.SNAPSHOT",org.drools.guvnor.client.modeldriv
+ en;uses:="org.drools.guvnor.client.modeldriven.brl";version="5.1.0.SN
+ APSHOT",org.drools.reteoo.compiled;uses:="org.drools.compiler,org.dro
+ ols.rule.builder.dialect.java";version="5.1.0.SNAPSHOT",org.drools.xm
+ l.processes;uses:="org.drools.xml,org.xml.sax,org.w3c.dom,javax.xml.t
+ ransform.stream,javax.xml.transform";version="5.1.0.SNAPSHOT",org.dro
+ ols.rule.builder.dialect.java.parser;uses:="org.antlr.runtime";versio
+ n="5.1.0.SNAPSHOT",org.drools.semantics.java.parser;version="5.1.0.SN
+ APSHOT",org.drools.rule.builder.dialect.java;uses:="org.drools.rule.b
+ uilder,org.mvel2.integration,org.mvel2.integration.impl,org.mvel2.tem
+ plates,org.mvel2.compiler,org.mvel2.optimizers,org.drools.compiler,or
+ g.drools.rule.builder.dialect.mvel,org.drools.rule.builder.dialect.ja
+ va.parser,org.antlr.runtime,org.mvel2";version="5.1.0.SNAPSHOT",org.d
+ rools.compiler;uses:="org.drools.rule.builder,org.antlr.runtime.tree,
+ org.antlr.runtime,org.drools.guvnor.server.util,org.xml.sax,org.drool
+ s.xml,org.drools.guvnor.client.modeldriven.brl,org.mvel2,org.drools.p
+ rocess.builder,org.drools.xml.processes";version="5.1.0.SNAPSHOT",org
+ .drools.xml;uses:="org.drools.xml.processes,org.drools.xml.rules,org.
+ xml.sax,javax.xml.parsers";version="5.1.0.SNAPSHOT",org.drools.rule.b
+ uilder.dialect.mvel;uses:="org.drools.rule.builder,org.drools.compile
+ r,org.mvel2,org.mvel2.compiler,org.mvel2.util,org.drools.rule.builder
+ .dialect.java,org.mvel2.ast";version="5.1.0.SNAPSHOT",org.drools.guvn
+ or.server.rules;uses:="org.drools.guvnor.server.util,org.drools.compi
+ ler,org.drools.guvnor.client.modeldriven";version="5.1.0.SNAPSHOT",or
+ g.drools.guvnor.client.modeldriven.brl;version="5.1.0.SNAPSHOT",org.d
+ rools.guvnor.server;version="5.1.0.SNAPSHOT"
Bundle-Version: 5.1.0.SNAPSHOT
Bundle-Name: Drools :: Compiler
Bundle-Description: A rule production system
Modified: labs/jbossrules/trunk/drools-container/drools-mc/src/main/java/org/drools/mc/io/VFSResourceProvider.java
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-mc/src/main/java/org/drools/mc/io/VFSResourceProvider.java 2010-01-18 05:18:02 UTC (rev 31116)
+++ labs/jbossrules/trunk/drools-container/drools-mc/src/main/java/org/drools/mc/io/VFSResourceProvider.java 2010-01-18 05:42:15 UTC (rev 31117)
@@ -24,7 +24,7 @@
import java.net.MalformedURLException;
import java.net.URL;
-import org.drools.io.impl.ResourceProviderImpl;
+import org.drools.io.impl.ResourceFactoryServiceImpl;
import org.drools.io.Resource;
import org.drools.util.StringUtils;
@@ -33,7 +33,7 @@
*
* @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
*/
-public class VFSResourceProvider extends ResourceProviderImpl
+public class VFSResourceProvider extends ResourceFactoryServiceImpl
{
/**
* Determine a cleaned URL for the given original URL.
Modified: labs/jbossrules/trunk/drools-container/drools-mc/src/test/java/org/drools/test/mc/io/test/ResourcesTest.java
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-mc/src/test/java/org/drools/test/mc/io/test/ResourcesTest.java 2010-01-18 05:18:02 UTC (rev 31116)
+++ labs/jbossrules/trunk/drools-container/drools-mc/src/test/java/org/drools/test/mc/io/test/ResourcesTest.java 2010-01-18 05:42:15 UTC (rev 31117)
@@ -26,9 +26,9 @@
import java.util.Set;
import java.util.HashSet;
-import org.drools.io.InternalResource;
+import org.drools.io.internal.InternalResource;
import org.drools.io.Resource;
-import org.drools.io.ResourceProvider;
+import org.drools.io.ResourceFactoryService;
import org.drools.mc.io.VFSResourceProvider;
import org.drools.test.mc.BaseTest;
@@ -39,20 +39,20 @@
*/
public class ResourcesTest extends BaseTest
{
- private ResourceProvider provider;
+ private ResourceFactoryService factoryService;
- protected ResourceProvider getResourceProvider()
+ protected ResourceFactoryService getResourceProvider()
{
- if (provider == null)
- provider = new VFSResourceProvider();
+ if (factoryService == null)
+ factoryService = new VFSResourceProvider();
- return provider;
+ return factoryService;
}
protected Resource findResource(String name)
{
URL url = getResource(name);
- ResourceProvider provider = getResourceProvider();
+ ResourceFactoryService provider = getResourceProvider();
Resource root = provider.newUrlResource(url);
assertNotNull(root);
return root;
Modified: labs/jbossrules/trunk/drools-core/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/drools-core/META-INF/MANIFEST.MF 2010-01-18 05:18:02 UTC (rev 31116)
+++ labs/jbossrules/trunk/drools-core/META-INF/MANIFEST.MF 2010-01-18 05:42:15 UTC (rev 31117)
@@ -8,11 +8,14 @@
,com.thoughtworks.xstream.io.xml;version="1.3",com.thoughtworks.xstre
am.mapper;version="1.3",javax.management,javax.management.openmbean,j
avax.swing,javax.swing.border,javax.swing.event,javax.xml.parsers,org
- .mvel2,org.mvel2.asm,org.mvel2.asm.util,org.mvel2.ast,org.mvel2.compi
- ler,org.mvel2.debug,org.mvel2.integration,org.mvel2.integration.impl,
- org.mvel2.optimizers,org.mvel2.templates,org.mvel2.util,org.osgi.fram
- ework;version="1.5",org.w3c.dom,org.xml.sax,org.xml.sax.helpers
-Bnd-LastModified: 1263788852558
+ .mvel2;version="2.0",org.mvel2.asm;version="2.0",org.mvel2.asm.util;v
+ ersion="2.0",org.mvel2.ast;version="2.0",org.mvel2.compiler;version="
+ 2.0",org.mvel2.debug;version="2.0",org.mvel2.integration;version="2.0
+ ",org.mvel2.integration.impl;version="2.0",org.mvel2.optimizers;versi
+ on="2.0",org.mvel2.templates;version="2.0",org.mvel2.util;version="2.
+ 0",org.osgi.framework;version="1.5",org.w3c.dom,org.xml.sax,org.xml.s
+ ax.helpers
+Bnd-LastModified: 1263792618964
Export-Package: org.drools.process.instance.context.swimlane;uses:="or
g.drools.process.core.context.swimlane,org.drools.process.core,org.dr
ools.process.instance.context";version="5.1.0.SNAPSHOT",org.drools.pr
@@ -20,7 +23,7 @@
lidation;uses:="org.mvel2.compiler,org.drools.process.core.timer,org.
drools.process.core.validation,org.drools.process.core.datatype,org.d
rools.workflow.core.node,org.drools.process.core.context.variable,org
- .drools.workflow.core.impl,org.mvel2,org.drools.time,org.drools.proce
+ .drools.time,org.drools.workflow.core.impl,org.mvel2,org.drools.proce
ss.core.validation.impl,org.drools,org.drools.ruleflow.core,org.drool
s.process.core,org.drools.workflow.core";version="5.1.0.SNAPSHOT",org
.drools.ruleflow.instance;uses:="org.drools.workflow.instance.impl,or
@@ -39,8 +42,8 @@
uses:="org.drools,org.drools.impl,org.osgi.framework,org.drools.io.im
pl";version="5.1.0.SNAPSHOT",org.drools.ruleflow.core.factory;uses:="
org.drools.workflow.core.impl,org.drools.ruleflow.core,org.drools.wor
- kflow.core.node,org.drools.workflow.core,org.drools.process.core.data
- type,org.drools.process.core,org.drools.process.core.context.exceptio
+ kflow.core.node,org.drools.workflow.core,org.drools.process.core,org.
+ drools.process.core.datatype,org.drools.process.core.context.exceptio
n,org.drools.process.core.context.variable,org.drools.process.core.ev
ent,org.drools.process.core.timer,org.drools.process.core.impl";versi
on="5.1.0.SNAPSHOT",org.drools.marshalling.impl;uses:="org.drools.wor
@@ -48,7 +51,7 @@
drools.process.instance,org.drools.workflow.instance.node,org.drools.
workflow.instance,org.drools.process.core,org.drools.process.instance
.context.variable,org.drools.common,org.drools.util,org.drools.impl,o
- rg.drools,org.drools.concurrent,org.drools.spi,org.drools.process.ins
+ rg.drools.concurrent,org.drools,org.drools.spi,org.drools.process.ins
tance.timer,org.drools.base,org.drools.rule,org.drools.process.instan
ce.impl,org.drools.process.instance.event,org.drools.ruleflow.instanc
e";version="5.1.0.SNAPSHOT",org.drools.time;uses:="org.drools.rule,or
@@ -74,8 +77,8 @@
tance.context,org.drools.common";version="5.1.0.SNAPSHOT",org.drools.
audit;uses:="org.drools.event,org.drools,org.drools.audit.event,com.t
houghtworks.xstream,org.drools.impl,org.drools.workflow.core.node,org
- .drools.command,org.drools.workflow.instance,org.drools.workflow.inst
- ance.node,org.drools.rule,org.drools.spi,org.drools.command.impl,org.
+ .drools.command,org.drools.workflow.instance.node,org.drools.workflow
+ .instance,org.drools.rule,org.drools.spi,org.drools.command.impl,org.
drools.common";version="5.1.0.SNAPSHOT",org.drools.base.extractors;us
es:="org.drools.base,org.drools.util,org.drools.spi,org.drools.common
,org.drools,org.mvel2,org.mvel2.compiler";version="5.1.0.SNAPSHOT",or
@@ -88,7 +91,7 @@
e.context.variable,org.drools.process.instance.context.variable,org.d
rools.common,org.drools.ruleflow.instance,org.drools.ruleflow.core";v
ersion="5.1.0.SNAPSHOT",org.drools.process.core.context.variable;uses
- :="org.drools.process.core,org.drools.process.core.datatype,org.drool
+ :="org.drools.process.core.datatype,org.drools.process.core,org.drool
s.process.core.datatype.impl.type,org.drools.process.core.context";ve
rsion="5.1.0.SNAPSHOT",org.drools.event.rule.impl;uses:="org.drools.e
vent,org.drools,org.drools.spi,org.drools.common,org.drools.impl";ver
@@ -104,7 +107,7 @@
g.xml.sax,org.drools.xml.changeset,javax.xml.parsers,org.xml.sax.help
ers,org.w3c.dom,org.drools";version="5.1.0.SNAPSHOT",org.drools.factt
emplates;uses:="org.drools.rule,org.drools.base,org.drools,org.drools
- .spi,org.drools.util,org.drools.common";version="5.1.0.SNAPSHOT",org.
+ .util,org.drools.spi,org.drools.common";version="5.1.0.SNAPSHOT",org.
drools.base.field;uses:="org.drools,org.drools.spi,org.drools.util,or
g.drools.common";version="5.1.0.SNAPSHOT",org.drools.runtime.rule.imp
l;uses:="org.drools.spi,org.drools.common,org.drools,org.drools.rule"
@@ -167,7 +170,7 @@
ls.util.asm,org.drools.util,org.drools.common,org.drools.time,org.dro
ols.base.evaluators,org.drools.base.extractors,org.mvel2.asm,org.droo
ls.rule,org.drools.impl,org.drools.base.field,org.drools.type,org.mve
- l2.ast,org.mvel2.integration,org.mvel2.compiler,org.drools.base.mvel,
+ l2.ast,org.mvel2.compiler,org.mvel2.integration,org.drools.base.mvel,
org.drools.facttemplates";version="5.1.0.SNAPSHOT",org.drools;uses:="
org.drools.spi,org.drools.time,org.drools.time.impl,org.drools.rule,o
rg.drools.common,org.drools.workflow.instance.impl,org.drools.process
@@ -180,7 +183,7 @@
.mvel2,org.drools.util,org.drools.command.impl";version="5.1.0.SNAPSH
OT",org.drools.agent.impl;uses:="org.drools,org.drools.spi,org.drools
.rule,org.drools.definitions.impl,org.drools.util,org.drools.agent,or
- g.drools.impl,org.drools.io.internal,org.drools.xml,org.drools.proces
+ g.drools.impl,org.drools.xml,org.drools.io.internal,org.drools.proces
s.core,org.drools.io.impl,org.drools.common";version="5.1.0.SNAPSHOT"
,org.drools.spi;uses:="org.drools.base,org.drools,org.drools.rule,org
.drools.common,org.drools.util,org.drools.time,org.drools.concurrent,
@@ -205,8 +208,8 @@
n="5.1.0.SNAPSHOT",org.drools.process.core.validation;version="5.1.0.
SNAPSHOT",org.drools.process.instance.context.exception;uses:="org.dr
ools.base,org.drools.workflow.instance,org.drools,org.drools.spi,org.
- drools.process.instance,org.drools.workflow.core,org.drools.process.c
- ore.context.exception,org.drools.common,org.drools.process.core,org.d
+ drools.process.instance,org.drools.process.core.context.exception,org
+ .drools.workflow.core,org.drools.common,org.drools.process.core,org.d
rools.process.instance.context";version="5.1.0.SNAPSHOT",org.drools.x
ml.changeset;uses:="org.drools.xml,org.xml.sax,org.drools,org.w3c.dom
,org.drools.io.impl,org.drools.io.internal,org.drools.builder.conf.im
@@ -214,8 +217,8 @@
nce.timer;uses:="org.drools.time,org.drools,org.drools.process.instan
ce.event,org.drools.process.instance,org.drools.time.impl";version="5
.1.0.SNAPSHOT",org.drools.base.dataproviders;uses:="org.mvel2,org.mve
- l2.integration,org.drools,org.drools.rule,org.drools.util,org.drools.
- base.mvel,org.drools.spi";version="5.1.0.SNAPSHOT",org.drools.process
+ l2.integration,org.drools,org.drools.rule,org.drools.spi,org.drools.u
+ til,org.drools.base.mvel";version="5.1.0.SNAPSHOT",org.drools.process
.instance.impl.factory;uses:="org.drools.process.core,org.drools.proc
ess.instance,org.drools.process.instance.impl,org.drools.process.inst
ance.context";version="5.1.0.SNAPSHOT",org.drools.workflow.instance;u
@@ -266,8 +269,8 @@
untime.pipeline,org.drools.command,org.drools.command.runtime.rule,or
g.mvel2,org.mvel2.compiler,org.drools.common,org.drools,org.drools.im
pl,org.drools.rule";version="5.1.0.SNAPSHOT",org.drools.command.runti
- me.rule;uses:="org.drools.command,org.drools.command.impl,org.drools.
- impl,org.drools,org.drools.spi,org.drools.runtime.impl,org.drools.com
+ me.rule;uses:="org.drools.command,org.drools.command.impl,org.drools,
+ org.drools.impl,org.drools.spi,org.drools.runtime.impl,org.drools.com
mon,org.mvel2";version="5.1.0.SNAPSHOT",org.drools.command.runtime;us
es:="org.drools.command,org.drools.command.impl,org.drools.runtime.im
pl,org.drools.impl,org.drools";version="5.1.0.SNAPSHOT"
Modified: labs/jbossrules/trunk/drools-decisiontables/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/drools-decisiontables/META-INF/MANIFEST.MF 2010-01-18 05:18:02 UTC (rev 31116)
+++ labs/jbossrules/trunk/drools-decisiontables/META-INF/MANIFEST.MF 2010-01-18 05:42:15 UTC (rev 31117)
@@ -4,7 +4,7 @@
Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
Import-Package: jxl;version="2.6",jxl.read.biff;version="2.6",org.osgi
.framework;version="1.5"
-Bnd-LastModified: 1263462751296
+Bnd-LastModified: 1263792649583
Export-Package: org.drools.decisiontable;uses:="org.drools.decisiontab
le.parser.csv,org.drools.decisiontable.parser,org.drools.decisiontabl
e.parser.xls";version="5.1.0.SNAPSHOT",org.drools.decisiontable.parse
Modified: labs/jbossrules/trunk/drools-templates/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/drools-templates/META-INF/MANIFEST.MF 2010-01-18 05:18:02 UTC (rev 31116)
+++ labs/jbossrules/trunk/drools-templates/META-INF/MANIFEST.MF 2010-01-18 05:42:15 UTC (rev 31117)
@@ -1,8 +1,8 @@
Manifest-Version: 1.0
Created-By: 1.5.0_16 (Sun Microsystems Inc.)
Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
-Import-Package: org.mvel2.templates
-Bnd-LastModified: 1263462749205
+Import-Package: org.mvel2.templates;version="2.0"
+Bnd-LastModified: 1263792647789
Export-Package: org.drools.template.jdbc;uses:="org.drools.template.pa
rser";version="5.1.0.SNAPSHOT",org.drools.template;uses:="org.drools.
template.parser,org.drools.template.objects";version="5.1.0.SNAPSHOT"
More information about the jboss-svn-commits
mailing list