You are viewing a plain text version of this content. The canonical link for it is here.
Posted to imperius-commits@incubator.apache.org by jn...@apache.org on 2008/01/21 19:39:09 UTC
svn commit: r613981 - in /incubator/imperius/trunk:
imperius-javasplextension/ imperius-splcore/META-INF/
imperius-splcore/src/main/java/org/apache/imperius/spl/parser/factory/
imperius-spleditorcore/
Author: jneeraj
Date: Mon Jan 21 11:39:07 2008
New Revision: 613981
URL: http://svn.apache.org/viewvc?rev=613981&view=rev
Log:
IMPERIUS-2 patches - by Erik
1. Clean up build.properties and manifests with unused imports etc
2. Class loading fixes in ACPLParserMap
Modified:
incubator/imperius/trunk/imperius-javasplextension/build.properties
incubator/imperius/trunk/imperius-splcore/META-INF/MANIFEST.MF
incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/factory/ACPLParserMap.java
incubator/imperius/trunk/imperius-spleditorcore/build.properties
Modified: incubator/imperius/trunk/imperius-javasplextension/build.properties
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-javasplextension/build.properties?rev=613981&r1=613980&r2=613981&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-javasplextension/build.properties (original)
+++ incubator/imperius/trunk/imperius-javasplextension/build.properties Mon Jan 21 11:39:07 2008
@@ -1,8 +1,14 @@
output.. = bin/
-bin.includes = plugin.xml,\
- plugin.properties,\
- javaspl.jar,\
+bin.includes = plugin.xml,/
+ plugin.properties,/
META-INF/
-jars.compile.order = javaspl.jar
-source.javaspl.jar = src/
-output.javaspl.jar = bin/
+jars.compile.order = .
+source.. = src/
+src.includes = build.properties,\
+ feature.xml,\
+ plugin.properties,\
+ plugin.xml,\
+ META-INF/,\
+ pom.xml,\
+ src/
+
Modified: incubator/imperius/trunk/imperius-splcore/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/META-INF/MANIFEST.MF?rev=613981&r1=613980&r2=613981&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/META-INF/MANIFEST.MF (original)
+++ incubator/imperius/trunk/imperius-splcore/META-INF/MANIFEST.MF Mon Jan 21 11:39:07 2008
@@ -4,25 +4,31 @@
Bundle-SymbolicName: org.apache.imperius.splcore
Bundle-Version: 1.0.0
Bundle-ClassPath: .
-Export-Package: org.apache.imperius.spl.datastore,
- org.apache.imperius.spl.evaluator,
- org.apache.imperius.spl.external,
- org.apache.imperius.spl.manager,
- org.apache.imperius.spl.manager.impl,
- org.apache.imperius.spl.parser.compiler,
- org.apache.imperius.spl.parser.compiler.symboltable,
+Export-Package: org.apache.imperius.spl.datastore;uses:="org.apache.imperius.spl.parser.statements.impl",
+ org.apache.imperius.spl.evaluator;uses:="org.apache.imperius.spl.parser.statements.impl",
+ org.apache.imperius.spl.external;uses:="org.apache.imperius.spl.manager,org.apache.imperius.spl.parser.util",
+ org.apache.imperius.spl.manager;uses:="org.apache.imperius.spl.external,org.apache.imperius.spl.parser.statements.impl",
+ org.apache.imperius.spl.manager.impl;uses:="org.apache.imperius.spl.manager,org.apache.imperius.spl.external,org.apache.imperius.spl.parser.statements.impl",
+ org.apache.imperius.spl.parser.compiler;
+ uses:="org.apache.imperius.spl.parser.compiler.symboltable,
+ antlr.collections,
+ org.apache.imperius.spl.parser.util,
+ org.apache.imperius.spl.external,
+ antlr",
+ org.apache.imperius.spl.parser.compiler.symboltable;uses:="org.apache.imperius.spl.parser.util,org.apache.imperius.spl.external,org.apache.imperius.spl.parser.statements.impl",
org.apache.imperius.spl.parser.exceptions,
- org.apache.imperius.spl.parser.expressions,
- org.apache.imperius.spl.parser.factory,
- org.apache.imperius.spl.parser.statements.impl,
- org.apache.imperius.spl.parser.util,
+ org.apache.imperius.spl.parser.expressions;uses:="org.apache.imperius.spl.parser.compiler.symboltable,org.apache.imperius.spl.parser.util,org.apache.imperius.spl.external",
+ org.apache.imperius.spl.parser.factory;uses:="org.apache.imperius.spl.parser.compiler.symboltable,org.apache.imperius.spl.external,org.apache.imperius.spl.parser.statements",
+ org.apache.imperius.spl.parser.statements.impl;
+ uses:="org.apache.imperius.spl.parser.compiler.symboltable,
+ org.apache.imperius.spl.parser.util,
+ org.apache.imperius.spl.parser.statements,
+ org.apache.imperius.spl.external",
+ org.apache.imperius.spl.parser.util;uses:="org.apache.imperius.spl.parser.expressions.impl,org.apache.imperius.spl.external",
org.apache.imperius.util
Import-Package: antlr,
- antlr.actions.java,
- antlr.build,
antlr.collections,
antlr.collections.impl,
- antlr.debug,
- antlr.debug.misc,
- antlr.preprocessor
+ antlr.debug.misc
+
Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/factory/ACPLParserMap.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/factory/ACPLParserMap.java?rev=613981&r1=613980&r2=613981&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/factory/ACPLParserMap.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/factory/ACPLParserMap.java Mon Jan 21 11:39:07 2008
@@ -358,7 +358,7 @@
List customActionList = aCustomActionList;
Iterator it = customActionList.iterator();
- URLClassLoader uc = new URLClassLoader(aUrls);
+ URLClassLoader uc = new URLClassLoader(aUrls,ACPLParserMap.class.getClassLoader());
while (it.hasNext()) {
String customActionName = (String) it.next();
int lastIndexOfDot = customActionName.lastIndexOf('.');
@@ -389,7 +389,7 @@
URL[] aUrls) throws SPLException {
List customActionList = aCustomOperatorList;
Iterator it = customActionList.iterator();
- URLClassLoader uc = new URLClassLoader(aUrls);
+ URLClassLoader uc = new URLClassLoader(aUrls,ACPLParserMap.class.getClassLoader());
while (it.hasNext()) {
String customActionName = (String) it.next();
int lastIndexOfDot = customActionName.lastIndexOf('.');
Modified: incubator/imperius/trunk/imperius-spleditorcore/build.properties
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-spleditorcore/build.properties?rev=613981&r1=613980&r2=613981&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-spleditorcore/build.properties (original)
+++ incubator/imperius/trunk/imperius-spleditorcore/build.properties Mon Jan 21 11:39:07 2008
@@ -1,22 +1,17 @@
-source.policyeditor.jar = src/
-output.policyeditor.jar = bin/
bin.includes = META-INF/,\
plugin.properties,\
plugin.xml,\
- .classpath,\
bin/,\
icons/,\
schema/,\
- antlr.jar,\
- policyeditor.jar,\
- imperius-splcore-1.0.0.jar
-jars.compile.order = antlr.jar,\
- policyeditor.jar
-src.includes = .classpath,\
- META-INF/,\
- antlr.jar,\
+ .
+src.includes = META-INF/,\
icons/,\
plugin.properties,\
- imperius-splcore-1.0.0.jar,\
plugin.xml,\
- schema/
+ schema/,\
+ build.properties,\
+ site.xml,\
+ pom.xml,\
+ src/
+source.. = src/
\ No newline at end of file