[jboss-svn-commits] JBL Code SVN: r30989 - in labs/jbossrules/trunk/drools-container/drools-osgi: org.drools.osgi/META-INF and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Jan 8 15:00:15 EST 2010
Author: mark.proctor at jboss.com
Date: 2010-01-08 15:00:14 -0500 (Fri, 08 Jan 2010)
New Revision: 30989
Added:
labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi/src/main/java/org/drools/
labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi/src/main/java/org/drools/Activator.java
labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi/src/main/java/org/drools/Test1.java
Modified:
labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi.fragment/.classpath
labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi.fragment/META-INF/MANIFEST.MF
labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi.fragment/build.properties
labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi.fragment/pom.xml
labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi/.classpath
labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi/META-INF/MANIFEST.MF
labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi/build.properties
labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi/plugin.xml
labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi/pom.xml
Log:
JBRULES-2351 OSGi Ready
-works in eclipse, but code completion is still leaky from the fragment.
Modified: labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi/.classpath 2010-01-08 18:31:38 UTC (rev 30988)
+++ labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi/.classpath 2010-01-08 20:00:14 UTC (rev 30989)
@@ -4,40 +4,11 @@
<classpathentry kind="src" path="src/main/resources"/>
<classpathentry kind="src" path="src/test/java"/>
<classpathentry kind="src" path="src/test/resources"/>
- <classpathentry exported="true" kind="lib" path="lib/activation.jar"/>
<classpathentry exported="true" kind="lib" path="lib/antlr-runtime.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/commons-beanutils.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/commons-collections.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/commons-digester.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/commons-jexl.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/commons-lang.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/commons-logging.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/drools-bpmn2.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/drools-compiler.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/drools-core.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/drools-decisiontables.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/drools-templates.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/freemarker.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/jaxb-api.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/jaxb-impl.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/jaxb-xjc.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/jms.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/drools-api.jar"/>
<classpathentry exported="true" kind="lib" path="lib/joda-time.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jxl.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/jxls-reader.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/log4j.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/milyn-commons.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/milyn-smooks-core.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/milyn-smooks-javabean.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/mvel.jar"/>
<classpathentry exported="true" kind="lib" path="lib/mvel2.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/poi.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/quartz.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/stax-api.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/xpp3_min.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/xpp3.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/xstream.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/drools-api.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="target/classes"/>
Modified: labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi/META-INF/MANIFEST.MF 2010-01-08 18:31:38 UTC (rev 30988)
+++ labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi/META-INF/MANIFEST.MF 2010-01-08 20:00:14 UTC (rev 30989)
@@ -7,46 +7,16 @@
Bundle-Vendor: JBoss, a division of Red Hat
Bundle-Localization: plugin
Require-Bundle: org.eclipse.jdt.core,
- org.eclipse.osgi;bundle-version="3.5.1",
- drools-api;bundle-version="5.1.0"
+ org.eclipse.osgi;bundle-version="3.5.1"
Eclipse-BuddyPolicy: registered
Bundle-ClassPath: .,
- lib/drools-api.jar,
- lib/activation.jar,
lib/antlr-runtime.jar,
- lib/commons-beanutils.jar,
- lib/commons-collections.jar,
- lib/commons-digester.jar,
- lib/commons-jexl.jar,
- lib/commons-lang.jar,
- lib/commons-logging.jar,
- lib/drools-bpmn2.jar,
- lib/drools-compiler.jar,
- lib/drools-core.jar,
- lib/drools-decisiontables.jar,
- lib/drools-templates.jar,
- lib/freemarker.jar,
- lib/jaxb-api.jar,
- lib/jaxb-impl.jar,
- lib/jaxb-xjc.jar,
- lib/jms.jar,
+ lib/drools-api.jar,
lib/joda-time.jar,
lib/jxl.jar,
- lib/jxls-reader.jar,
- lib/log4j.jar,
- lib/milyn-commons.jar,
- lib/milyn-smooks-core.jar,
- lib/milyn-smooks-javabean.jar,
- lib/mvel.jar,
- lib/mvel2.jar,
- lib/poi.jar,
- lib/quartz.jar,
- lib/stax-api.jar,
- lib/xpp3_min.jar,
- lib/xpp3.jar,
- lib/xstream.jar
+ lib/mvel2.jar
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Import-Package: org.osgi.framework
+Eclipse-ExtensibleAPI: true
Export-Package: org.drools,
org.drools.agent,
org.drools.builder,
@@ -79,5 +49,6 @@
org.drools.time,
org.drools.util,
org.drools.vsm
+Import-Package: org.eclipse.core.runtime
Modified: labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi/build.properties
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi/build.properties 2010-01-08 18:31:38 UTC (rev 30988)
+++ labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi/build.properties 2010-01-08 20:00:14 UTC (rev 30989)
@@ -2,40 +2,11 @@
src/main/resources/META-INF/,\
plugin.xml,\
lib/,\
- lib/drools-api.jar,\
- lib/activation.jar,\
lib/antlr-runtime.jar,\
- lib/commons-beanutils.jar,\
- lib/commons-collections.jar,\
- lib/commons-digester.jar,\
- lib/commons-jexl.jar,\
- lib/commons-lang.jar,\
- lib/commons-logging.jar,\
- lib/drools-bpmn2.jar,\
- lib/drools-compiler.jar,\
- lib/drools-core.jar,\
- lib/drools-decisiontables.jar,\
- lib/drools-templates.jar,\
- lib/freemarker.jar,\
- lib/jaxb-api.jar,\
- lib/jaxb-impl.jar,\
- lib/jaxb-xjc.jar,\
- lib/jms.jar,\
+ lib/drools-api.jar,\
lib/joda-time.jar,\
lib/jxl.jar,\
- lib/jxls-reader.jar,\
- lib/log4j.jar,\
- lib/milyn-commons.jar,\
- lib/milyn-smooks-core.jar,\
- lib/milyn-smooks-javabean.jar,\
- lib/mvel.jar,\
- lib/mvel2.jar,\
- lib/poi.jar,\
- lib/quartz.jar,\
- lib/stax-api.jar,\
- lib/xpp3_min.jar,\
- lib/xpp3.jar,\
- lib/xstream.jar
+ lib/mvel2.jar
src.includes = src/main/resources/META-INF/,\
plugin.xml,\
lib/,\
Modified: labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi/plugin.xml
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi/plugin.xml 2010-01-08 18:31:38 UTC (rev 30988)
+++ labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi/plugin.xml 2010-01-08 20:00:14 UTC (rev 30989)
@@ -1,90 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.0"?>
<plugin>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- <!-- Extensions for the interactive debugger -->
-
-
-
-
-
-
-
- <!-- not used anymore
- <extension
- point="org.eclipse.debug.core.sourcePathComputers">
- <sourcePathComputer
- class="org.drools.eclipse.launching.DroolsSourcePathComputerDelegate"
- id="org.drools.eclipse.launching.DroolsSourcePathComputerDelegate">
- </sourcePathComputer>
- </extension> -->
-
-
- <!-- not working if using multipage editor -->
-
- <!-- not working if using multipage editor -->
-
-
-
-
-
-
- <extension-point id="processExtension" name="Process Extension" schema="schema/processExtension.exsd"/>
- <extension-point id="runtimeRecognizer" name="Drools Runtime Recognizer" schema="schema/runtimeRecognizer.exsd"/>
-
-
- <!-- RuleBuilder Extensions -->
-
-
-
- <!-- tabbed properties
- <extension point="org.eclipse.ui.views.properties.tabbed.propertyContributor">
- <propertyContributor
- contributorId="org.drools.eclipse.flow.ruleflow.editor.RuleFlowModelEditor"
- labelProvider="org.drools.eclipse.flow.common.view.property.ProcessLabelProvider"
- typeMapper="org.drools.eclipse.flow.common.view.property.ProcessTypeMapper">
- <propertyCategory category="org.drools.eclipse.flow.general"/>
- </propertyContributor>
- </extension>
-
- <extension point="org.eclipse.ui.views.properties.tabbed.propertyTabs">
- <propertyTabs contributorId="org.drools.eclipse.flow.ruleflow.editor.RuleFlowModelEditor">
- <propertyTab
- category="org.drools.eclipse.flow.general"
- id="org.drools.eclipse.flow.general"
- label="General"/>
- </propertyTabs>
- </extension>
-
- <extension point="org.eclipse.ui.views.properties.tabbed.propertySections">
- <propertySections contributorId="org.drools.eclipse.flow.ruleflow.editor.RuleFlowModelEditor">
- <propertySection
- class="org.drools.eclipse.flow.ruleflow.view.property.ElementNameSection"
- id="org.drools.eclipse.flow.ruleflow.view.property.ElementNameSection"
- tab="org.drools.eclipse.flow.general">
- <input type="org.drools.eclipse.flow.common.editor.core.ElementWrapper"/>
- </propertySection>
- <propertySection
- class="org.drools.eclipse.flow.ruleflow.view.property.ProcessNameSection"
- id="org.drools.eclipse.flow.ruleflow.view.property.ProcessNameSection"
- tab="org.drools.eclipse.flow.general">
- <input type="org.drools.eclipse.flow.common.editor.core.ProcessWrapper"/>
- </propertySection>
- </propertySections>
- </extension> -->
-
</plugin>
Modified: labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi/pom.xml 2010-01-08 18:31:38 UTC (rev 30988)
+++ labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi/pom.xml 2010-01-08 20:00:14 UTC (rev 30989)
@@ -52,6 +52,8 @@
<overWriteSnapshots>true</overWriteSnapshots>
<overWriteIfNewer>true</overWriteIfNewer>
<stripVersion>true</stripVersion>
+ <includeScope>runtime</includeScope>
+ <excludeTransitive>false</excludeTransitive>
</configuration>
</execution>
</executions>
@@ -119,25 +121,10 @@
</exclusion>
</exclusions>
</dependency>
+
- <dependency>
- <groupId>org.drools</groupId>
- <artifactId>drools-bpmn2</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.eclipse.jdt</groupId>
- <artifactId>core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>janino</groupId>
- <artifactId>janino</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
-
</dependencies>
</project>
Added: labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi/src/main/java/org/drools/Activator.java
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi/src/main/java/org/drools/Activator.java (rev 0)
+++ labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi/src/main/java/org/drools/Activator.java 2010-01-08 20:00:14 UTC (rev 30989)
@@ -0,0 +1,7 @@
+package org.drools;
+
+import org.eclipse.core.runtime.Plugin;
+
+public class Activator extends Plugin {
+
+}
Added: labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi/src/main/java/org/drools/Test1.java
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi/src/main/java/org/drools/Test1.java (rev 0)
+++ labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi/src/main/java/org/drools/Test1.java 2010-01-08 20:00:14 UTC (rev 30989)
@@ -0,0 +1,14 @@
+package org.drools;
+
+import org.drools.builder.KnowledgeBuilderProvider;
+
+public class Test1 {
+ public static void test() {
+ try {
+ Class<KnowledgeBuilderProvider> cls = (Class<KnowledgeBuilderProvider>) Class.forName( "org.drools.builder.impl.KnowledgeBuilderProviderImpl", true, Test1.class.getClassLoader() );
+ System.out.println( cls );
+ } catch ( Exception e2 ) {
+ throw new RuntimeException( e2 );
+ }
+ }
+}
Modified: labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi.fragment/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi.fragment/.classpath 2010-01-08 18:31:38 UTC (rev 30988)
+++ labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi.fragment/.classpath 2010-01-08 20:00:14 UTC (rev 30989)
@@ -1,5 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
+ <classpathentry exported="true" kind="lib" path="lib/drools-bpmn2.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/drools-compiler.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/drools-core.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/drools-decisiontables.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/drools-templates.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src/main/java"/>
Modified: labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi.fragment/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi.fragment/META-INF/MANIFEST.MF 2010-01-08 18:31:38 UTC (rev 30988)
+++ labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi.fragment/META-INF/MANIFEST.MF 2010-01-08 20:00:14 UTC (rev 30989)
@@ -1,7 +1,13 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: Fragment
+Bundle-Name: Drools Runtime Fragment
Bundle-SymbolicName: org.drools.osgi.fragment
-Bundle-Version: 1.0.0.qualifier
-Fragment-Host: org.drools.osgi;bundle-version="5.1.0"
+Bundle-Version: 5.1.0.SNAPSHOT
+Fragment-Host: org.drools.osgi;bundle-version="5.1.0.SNAPSHOT"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-ClassPath: lib/drools-bpmn2.jar,
+ lib/drools-compiler.jar,
+ lib/drools-core.jar,
+ lib/drools-decisiontables.jar,
+ lib/drools-templates.jar
+Bundle-Vendor: JBoss, a division of Red Hat
Modified: labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi.fragment/build.properties
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi.fragment/build.properties 2010-01-08 18:31:38 UTC (rev 30988)
+++ labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi.fragment/build.properties 2010-01-08 20:00:14 UTC (rev 30989)
@@ -2,5 +2,10 @@
output.. = bin/
bin.includes = META-INF/,\
.,\
- lib/
+ lib/,\
+ lib/drools-bpmn2.jar,\
+ lib/drools-compiler.jar,\
+ lib/drools-core.jar,\
+ lib/drools-decisiontables.jar,\
+ lib/drools-templates.jar
src.includes = lib/
Modified: labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi.fragment/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi.fragment/pom.xml 2010-01-08 18:31:38 UTC (rev 30988)
+++ labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi.fragment/pom.xml 2010-01-08 20:00:14 UTC (rev 30989)
@@ -52,6 +52,7 @@
<overWriteSnapshots>true</overWriteSnapshots>
<overWriteIfNewer>true</overWriteIfNewer>
<stripVersion>true</stripVersion>
+ <includeScope>runtime</includeScope>
</configuration>
</execution>
</executions>
More information about the jboss-svn-commits
mailing list