You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2006/09/12 08:49:02 UTC
svn commit: r442486 - in /incubator/tuscany/sandbox/ant/container.easy/src:
main/java/org/apache/tuscany/container/easy/
test/java/org/apache/tuscany/container/easy/
test/java/org/apache/tuscany/container/easy/mock/
Author: antelder
Date: Mon Sep 11 23:49:01 2006
New Revision: 442486
URL: http://svn.apache.org/viewvc?view=rev&rev=442486
Log:
Remove references to old script code
Modified:
incubator/tuscany/sandbox/ant/container.easy/src/main/java/org/apache/tuscany/container/easy/EasyComponentTypeLoader.java
incubator/tuscany/sandbox/ant/container.easy/src/main/java/org/apache/tuscany/container/easy/EasyImplementation.java
incubator/tuscany/sandbox/ant/container.easy/src/main/java/org/apache/tuscany/container/easy/EasyImplementationLoader.java
incubator/tuscany/sandbox/ant/container.easy/src/main/java/org/apache/tuscany/container/easy/EasyInstanceFactory.java
incubator/tuscany/sandbox/ant/container.easy/src/test/java/org/apache/tuscany/container/easy/EasyComponentTestCase.java
incubator/tuscany/sandbox/ant/container.easy/src/test/java/org/apache/tuscany/container/easy/EasyComponentTypeLoaderTestCase.java
incubator/tuscany/sandbox/ant/container.easy/src/test/java/org/apache/tuscany/container/easy/EasyImplementationTestCase.java
incubator/tuscany/sandbox/ant/container.easy/src/test/java/org/apache/tuscany/container/easy/EasyInstanceFactoryTestCase.java
incubator/tuscany/sandbox/ant/container.easy/src/test/java/org/apache/tuscany/container/easy/mock/MockInstanceFactory.java
Modified: incubator/tuscany/sandbox/ant/container.easy/src/main/java/org/apache/tuscany/container/easy/EasyComponentTypeLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/ant/container.easy/src/main/java/org/apache/tuscany/container/easy/EasyComponentTypeLoader.java?view=diff&rev=442486&r1=442485&r2=442486
==============================================================================
--- incubator/tuscany/sandbox/ant/container.easy/src/main/java/org/apache/tuscany/container/easy/EasyComponentTypeLoader.java (original)
+++ incubator/tuscany/sandbox/ant/container.easy/src/main/java/org/apache/tuscany/container/easy/EasyComponentTypeLoader.java Mon Sep 11 23:49:01 2006
@@ -39,14 +39,10 @@
return EasyImplementation.class;
}
- protected String getResourceName(EasyImplementation implementation) {
- return implementation.getScriptInstanceFactory().getScriptName();
- }
-
// TODO: must be possible to move all the following up in to ComponentTypeLoaderExtension
public void load(CompositeComponent parent, EasyImplementation implementation, DeploymentContext deploymentContext) throws LoaderException {
- String sideFile = getSideFileName(implementation);
+ String sideFile = getSideFileName(implementation.getResourceName());
URL resource = implementation.getScriptInstanceFactory().getClassLoader().getResource(sideFile);
EasyComponentType componentType;
if (resource == null) {
@@ -64,13 +60,12 @@
return scriptComponentType;
}
- protected String getSideFileName(EasyImplementation implementation) {
- String baseName = getResourceName(implementation);
- int lastDot = baseName.lastIndexOf('.');
+ protected String getSideFileName(String resourceName) {
+ int lastDot = resourceName.lastIndexOf('.');
if (lastDot != -1) {
- baseName = baseName.substring(0, lastDot);
+ resourceName = resourceName.substring(0, lastDot);
}
- return baseName + ".componentType";
+ return resourceName + ".componentType";
}
}
Modified: incubator/tuscany/sandbox/ant/container.easy/src/main/java/org/apache/tuscany/container/easy/EasyImplementation.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/ant/container.easy/src/main/java/org/apache/tuscany/container/easy/EasyImplementation.java?view=diff&rev=442486&r1=442485&r2=442486
==============================================================================
--- incubator/tuscany/sandbox/ant/container.easy/src/main/java/org/apache/tuscany/container/easy/EasyImplementation.java (original)
+++ incubator/tuscany/sandbox/ant/container.easy/src/main/java/org/apache/tuscany/container/easy/EasyImplementation.java Mon Sep 11 23:49:01 2006
@@ -25,8 +25,18 @@
*/
public class EasyImplementation extends AtomicImplementation<EasyComponentType> {
+ private String resourceName;
+
private EasyInstanceFactory scriptInstanceFactory;
+ public String getResourceName() {
+ return resourceName;
+ }
+
+ public void setResourceName(String resourceName) {
+ this.resourceName = resourceName;
+ }
+
public EasyInstanceFactory getScriptInstanceFactory() {
return scriptInstanceFactory;
}
Modified: incubator/tuscany/sandbox/ant/container.easy/src/main/java/org/apache/tuscany/container/easy/EasyImplementationLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/ant/container.easy/src/main/java/org/apache/tuscany/container/easy/EasyImplementationLoader.java?view=diff&rev=442486&r1=442485&r2=442486
==============================================================================
--- incubator/tuscany/sandbox/ant/container.easy/src/main/java/org/apache/tuscany/container/easy/EasyImplementationLoader.java (original)
+++ incubator/tuscany/sandbox/ant/container.easy/src/main/java/org/apache/tuscany/container/easy/EasyImplementationLoader.java Mon Sep 11 23:49:01 2006
@@ -46,8 +46,7 @@
public abstract class EasyImplementationLoader extends LoaderExtension<EasyImplementation> {
@Constructor( { "registry" })
- public EasyImplementationLoader(@Autowire
- LoaderRegistry registry) {
+ public EasyImplementationLoader(@Autowire LoaderRegistry registry) {
super(registry);
}
Modified: incubator/tuscany/sandbox/ant/container.easy/src/main/java/org/apache/tuscany/container/easy/EasyInstanceFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/ant/container.easy/src/main/java/org/apache/tuscany/container/easy/EasyInstanceFactory.java?view=diff&rev=442486&r1=442485&r2=442486
==============================================================================
--- incubator/tuscany/sandbox/ant/container.easy/src/main/java/org/apache/tuscany/container/easy/EasyInstanceFactory.java (original)
+++ incubator/tuscany/sandbox/ant/container.easy/src/main/java/org/apache/tuscany/container/easy/EasyInstanceFactory.java Mon Sep 11 23:49:01 2006
@@ -25,18 +25,12 @@
*/
public abstract class EasyInstanceFactory<T extends EasyInstance> {
- protected String scriptName;
-
- protected String scriptSource;
-
- protected String className;
+ protected String resourceName;
protected ClassLoader classLoader;
- public EasyInstanceFactory(String scriptName, String className, String scriptSource, ClassLoader classLoader) {
- this.scriptName = scriptName;
- this.className = className;
- this.scriptSource = scriptSource;
+ public EasyInstanceFactory(String resourceName, ClassLoader classLoader) {
+ this.resourceName = resourceName;
this.classLoader = classLoader;
}
@@ -49,20 +43,11 @@
*/
public abstract T createInstance(Map<String, Object> context);
- public String getScriptName() {
- return scriptName;
- }
-
- public String getClassName() {
- return className;
- }
-
- public String getScriptSource() {
- return scriptSource;
+ public String getResourceName() {
+ return resourceName;
}
public ClassLoader getClassLoader() {
return classLoader;
}
-
}
Modified: incubator/tuscany/sandbox/ant/container.easy/src/test/java/org/apache/tuscany/container/easy/EasyComponentTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/ant/container.easy/src/test/java/org/apache/tuscany/container/easy/EasyComponentTestCase.java?view=diff&rev=442486&r1=442485&r2=442486
==============================================================================
--- incubator/tuscany/sandbox/ant/container.easy/src/test/java/org/apache/tuscany/container/easy/EasyComponentTestCase.java (original)
+++ incubator/tuscany/sandbox/ant/container.easy/src/test/java/org/apache/tuscany/container/easy/EasyComponentTestCase.java Mon Sep 11 23:49:01 2006
@@ -122,16 +122,16 @@
}
public EasyInstanceFactory createBSFEasy() throws IOException {
- URL scriptURL = getClass().getResource("foo.mock");
- InputStream is = scriptURL.openStream();
- StringBuilder sb = new StringBuilder();
- int i = 0;
- while ((i = is.read()) != -1) {
- sb.append((char) i);
- }
- is.close();
- String script = sb.toString();
- MockInstanceFactory bsfEasy = new MockInstanceFactory("foo.mock", "hello", script, null);
+// URL scriptURL = getClass().getResource("foo.mock");
+// InputStream is = scriptURL.openStream();
+// StringBuilder sb = new StringBuilder();
+// int i = 0;
+// while ((i = is.read()) != -1) {
+// sb.append((char) i);
+// }
+// is.close();
+// String script = sb.toString();
+ MockInstanceFactory bsfEasy = new MockInstanceFactory("foo.mock", null);
return bsfEasy;
}
}
Modified: incubator/tuscany/sandbox/ant/container.easy/src/test/java/org/apache/tuscany/container/easy/EasyComponentTypeLoaderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/ant/container.easy/src/test/java/org/apache/tuscany/container/easy/EasyComponentTypeLoaderTestCase.java?view=diff&rev=442486&r1=442485&r2=442486
==============================================================================
--- incubator/tuscany/sandbox/ant/container.easy/src/test/java/org/apache/tuscany/container/easy/EasyComponentTypeLoaderTestCase.java (original)
+++ incubator/tuscany/sandbox/ant/container.easy/src/test/java/org/apache/tuscany/container/easy/EasyComponentTypeLoaderTestCase.java Mon Sep 11 23:49:01 2006
@@ -51,24 +51,24 @@
private String script;
public void testGetSideFileName() {
- EasyInstanceFactory bsfEasy = new MockInstanceFactory("BSFEasyTestCase.mock", "hello", script, null);
+// EasyInstanceFactory bsfEasy = new MockInstanceFactory("BSFEasyTestCase.mock", "hello", script, null);
EasyComponentTypeLoader loader = new EasyComponentTypeLoader();
- EasyImplementation implementation = new EasyImplementation();
- implementation.setScriptInstanceFactory(bsfEasy);
- assertEquals("BSFEasyTestCase.componentType", loader.getSideFileName(implementation));
-
- bsfEasy = new MockInstanceFactory("BSFEasyTestCase", "hello", script, null);
- implementation.setScriptInstanceFactory(bsfEasy);
- assertEquals("BSFEasyTestCase.componentType", loader.getSideFileName(implementation));
+// EasyImplementation implementation = new EasyImplementation();
+// implementation.setScriptInstanceFactory(bsfEasy);
+ assertEquals("BSFEasyTestCase.componentType", loader.getSideFileName("BSFEasyTestCase.mock"));
+
+//// bsfEasy = new MockInstanceFactory("BSFEasyTestCase", "hello", script, null);
+//// implementation.setScriptInstanceFactory(bsfEasy);
+// assertEquals("BSFEasyTestCase.componentType", loader.getSideFileName("BSFEasyTestCase"));
}
public void testGetSideFileNameNoDot() {
- EasyInstanceFactory bsfEasy = new MockInstanceFactory("BSFEasyTestCase", "hello", script, null);
+// EasyInstanceFactory bsfEasy = new MockInstanceFactory("BSFEasyTestCase", "hello", script, null);
EasyComponentTypeLoader loader = new EasyComponentTypeLoader();
EasyImplementation implementation = new EasyImplementation();
- implementation.setScriptInstanceFactory(bsfEasy);
- assertEquals("BSFEasyTestCase.componentType", loader.getSideFileName(implementation));
+// implementation.setScriptInstanceFactory(bsfEasy);
+ assertEquals("BSFEasyTestCase.componentType", loader.getSideFileName("BSFEasyTestCase"));
}
@SuppressWarnings("unchecked")
@@ -85,7 +85,7 @@
@SuppressWarnings("unchecked")
public void testLoad() throws LoaderException {
- EasyInstanceFactory bsfEasy = new MockInstanceFactory("org/apache/tuscany/container/easy/foo.mock", "hello", script, getClass().getClassLoader());
+ EasyInstanceFactory bsfEasy = new MockInstanceFactory("org/apache/tuscany/container/easy/foo.mock", getClass().getClassLoader());
EasyComponentTypeLoader loader = new EasyComponentTypeLoader();
LoaderRegistry loaderRegistry = new LoaderRegistryImpl() {
public <MO extends ModelObject> MO load(CompositeComponent parent,
@@ -97,6 +97,7 @@
};
loader.setLoaderRegistry(loaderRegistry);
EasyImplementation implementation = new EasyImplementation();
+ implementation.setResourceName("org/apache/tuscany/container/easy/foo.mock");
implementation.setScriptInstanceFactory(bsfEasy);
DeploymentContext deploymentContext = createMock(DeploymentContext.class);
final ScopeContainer scopeContainer = createMock(ScopeContainer.class);
@@ -117,9 +118,10 @@
@SuppressWarnings("unchecked")
public void testLoadMissingSideFile() throws LoaderException {
- EasyInstanceFactory bsfEasy = new MockInstanceFactory("org/apche/tuscany/container/easy/foo.mock", "hello", script, getClass().getClassLoader());
+ EasyInstanceFactory bsfEasy = new MockInstanceFactory("org/apche/tuscany/container/easy/foo.mock", getClass().getClassLoader());
EasyComponentTypeLoader loader = new EasyComponentTypeLoader();
EasyImplementation implementation = new EasyImplementation();
+ implementation.setResourceName("org/apache/tuscany/container/easy/doesntExist");
implementation.setScriptInstanceFactory(bsfEasy);
DeploymentContext deploymentContext = createMock(DeploymentContext.class);
final ScopeContainer scopeContainer = createMock(ScopeContainer.class);
@@ -146,24 +148,25 @@
assertEquals(EasyImplementation.class, loader.getImplementationClass());
}
- public void testGetResourceName() {
- EasyComponentTypeLoader loader = new EasyComponentTypeLoader();
- EasyImplementation implementation = new EasyImplementation();
- EasyInstanceFactory bsfEasy = new MockInstanceFactory("PythonEasyTestCase.py", "hello", script, null);
- implementation.setScriptInstanceFactory(bsfEasy);
- assertEquals("PythonEasyTestCase.py", loader.getResourceName(implementation));
- }
+// public void testGetResourceName() {
+// EasyComponentTypeLoader loader = new EasyComponentTypeLoader();
+// EasyImplementation implementation = new EasyImplementation();
+// implementation.setResourceName("PythonEasyTestCase.py");
+//// EasyInstanceFactory bsfEasy = new MockInstanceFactory("PythonEasyTestCase.py", "hello", script, null);
+//// implementation.setScriptInstanceFactory(bsfEasy);
+// assertEquals("PythonEasyTestCase.py", loader.getResourceName(implementation));
+// }
@Override
public void setUp() throws IOException {
- URL scriptURL = getClass().getResource("foo.mock");
- InputStream is = scriptURL.openStream();
- StringBuilder sb = new StringBuilder();
- int i = 0;
- while ((i = is.read()) != -1) {
- sb.append((char) i);
- }
- is.close();
- script = sb.toString();
+// URL scriptURL = getClass().getResource("foo.mock");
+// InputStream is = scriptURL.openStream();
+// StringBuilder sb = new StringBuilder();
+// int i = 0;
+// while ((i = is.read()) != -1) {
+// sb.append((char) i);
+// }
+// is.close();
+// script = sb.toString();
}
}
Modified: incubator/tuscany/sandbox/ant/container.easy/src/test/java/org/apache/tuscany/container/easy/EasyImplementationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/ant/container.easy/src/test/java/org/apache/tuscany/container/easy/EasyImplementationTestCase.java?view=diff&rev=442486&r1=442485&r2=442486
==============================================================================
--- incubator/tuscany/sandbox/ant/container.easy/src/test/java/org/apache/tuscany/container/easy/EasyImplementationTestCase.java (original)
+++ incubator/tuscany/sandbox/ant/container.easy/src/test/java/org/apache/tuscany/container/easy/EasyImplementationTestCase.java Mon Sep 11 23:49:01 2006
@@ -18,18 +18,24 @@
assertEquals(bsfEasy, impl.getScriptInstanceFactory());
}
+ public void testGetResourceName() {
+ EasyImplementation impl = new EasyImplementation();
+ impl.setResourceName("foo");
+ assertEquals("foo", impl.getResourceName());
+ }
+
public void setUp() throws IOException {
- URL easyURL = getClass().getResource("foo.mock");
- assert easyURL != null;
- InputStream is = easyURL.openStream();
- StringBuilder sb = new StringBuilder();
- int i = 0;
- while ((i = is.read()) != -1) {
- sb.append((char) i);
- }
- is.close();
- String easy = sb.toString();
- bsfEasy = new MockInstanceFactory("BSFEasyTestCase", "hello", easy, null);
+// URL easyURL = getClass().getResource("foo.mock");
+// assert easyURL != null;
+// InputStream is = easyURL.openStream();
+// StringBuilder sb = new StringBuilder();
+// int i = 0;
+// while ((i = is.read()) != -1) {
+// sb.append((char) i);
+// }
+// is.close();
+// String easy = sb.toString();
+ bsfEasy = new MockInstanceFactory("BSFEasyTestCase", null);
}
}
Modified: incubator/tuscany/sandbox/ant/container.easy/src/test/java/org/apache/tuscany/container/easy/EasyInstanceFactoryTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/ant/container.easy/src/test/java/org/apache/tuscany/container/easy/EasyInstanceFactoryTestCase.java?view=diff&rev=442486&r1=442485&r2=442486
==============================================================================
--- incubator/tuscany/sandbox/ant/container.easy/src/test/java/org/apache/tuscany/container/easy/EasyInstanceFactoryTestCase.java (original)
+++ incubator/tuscany/sandbox/ant/container.easy/src/test/java/org/apache/tuscany/container/easy/EasyInstanceFactoryTestCase.java Mon Sep 11 23:49:01 2006
@@ -11,7 +11,7 @@
public class EasyInstanceFactoryTestCase extends TestCase {
public void testCreateInstance() throws InvocationTargetException {
- MockInstanceFactory factory = new MockInstanceFactory("foo.mock", "bar", "baz", getClass().getClassLoader());
+ MockInstanceFactory factory = new MockInstanceFactory("foo.mock", getClass().getClassLoader());
Map<String, Object> context = new HashMap<String, Object>();
context.put("foo", "bar");
EasyInstance instance = factory.createInstance(context);
@@ -19,7 +19,7 @@
}
public void testCreateInstanceNoClass() throws InvocationTargetException {
- MockInstanceFactory factory = new MockInstanceFactory("foo.mock", null, "baz", getClass().getClassLoader());
+ MockInstanceFactory factory = new MockInstanceFactory("foo.mock", getClass().getClassLoader());
Map<String, Object> context = new HashMap<String, Object>();
context.put("foo", "bar");
EasyInstance instance = factory.createInstance(context);
@@ -27,7 +27,7 @@
}
public void testCreateInstanceRuby() throws InvocationTargetException {
- MockInstanceFactory factory = new MockInstanceFactory("foo.mock", "bar", "baz", getClass().getClassLoader());
+ MockInstanceFactory factory = new MockInstanceFactory("foo.mock", getClass().getClassLoader());
Map<String, Object> context = new HashMap<String, Object>();
context.put("foo", "bar");
EasyInstance instance = factory.createInstance(context);
@@ -35,10 +35,8 @@
}
public void testGetters() throws InvocationTargetException {
- MockInstanceFactory factory = new MockInstanceFactory("foo", "bar", "baz", getClass().getClassLoader());
- assertEquals("foo", factory.getScriptName());
- assertEquals("bar", factory.getClassName());
- assertEquals("baz", factory.getScriptSource());
+ MockInstanceFactory factory = new MockInstanceFactory("foo", getClass().getClassLoader());
+ assertEquals("foo", factory.getResourceName());
assertEquals(getClass().getClassLoader(), factory.getClassLoader());
}
Modified: incubator/tuscany/sandbox/ant/container.easy/src/test/java/org/apache/tuscany/container/easy/mock/MockInstanceFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/ant/container.easy/src/test/java/org/apache/tuscany/container/easy/mock/MockInstanceFactory.java?view=diff&rev=442486&r1=442485&r2=442486
==============================================================================
--- incubator/tuscany/sandbox/ant/container.easy/src/test/java/org/apache/tuscany/container/easy/mock/MockInstanceFactory.java (original)
+++ incubator/tuscany/sandbox/ant/container.easy/src/test/java/org/apache/tuscany/container/easy/mock/MockInstanceFactory.java Mon Sep 11 23:49:01 2006
@@ -8,8 +8,8 @@
public class MockInstanceFactory extends EasyInstanceFactory<MockInstance> {
- public MockInstanceFactory(String scriptName, String className, String scriptSource, ClassLoader classLoader) {
- super(scriptName, className, scriptSource, classLoader);
+ public MockInstanceFactory(String scriptName, ClassLoader classLoader) {
+ super(scriptName, classLoader);
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org