Author: lresende
Date: Sun Nov 15 20:48:16 2009
New Revision: 836416
URL: http://svn.apache.org/viewvc?rev=836416&view=rev
Log:
Porting javascript extensibility from 1.x
Added:
tuscany/java/sca/modules/web-javascript-dojo/META-INF/
tuscany/java/sca/modules/web-javascript-dojo/META-INF/MANIFEST.MF
tuscany/java/sca/modules/web-javascript/META-INF/
tuscany/java/sca/modules/web-javascript/META-INF/MANIFEST.MF
Modified:
tuscany/java/sca/modules/web-javascript-dojo/pom.xml
tuscany/java/sca/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoModuleActivator.java
tuscany/java/sca/modules/web-javascript/pom.xml
tuscany/java/sca/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/DefaultComponentJavaScriptGeneratorExtensionPoint.java
tuscany/java/sca/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/DefaultJavascriptProxyFactoryExtensionPoint.java
Added: tuscany/java/sca/modules/web-javascript-dojo/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/web-javascript-dojo/META-INF/MANIFEST.MF?rev=836416&view=auto
==============================================================================
--- tuscany/java/sca/modules/web-javascript-dojo/META-INF/MANIFEST.MF (added)
+++ tuscany/java/sca/modules/web-javascript-dojo/META-INF/MANIFEST.MF Sun Nov
15 20:48:16 2009
@@ -0,0 +1,20 @@
+Manifest-Version: 1.0
+Tool: Bnd-0.0.357
+Bundle-Name: Apache Tuscany SCA Web JavaScript (DOJO)
+Created-By: 1.6.0_15 (Apple Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 2.0.0
+Bnd-LastModified: 1258084980430
+Bundle-ManifestVersion: 2
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: Apache Tuscany SCA Web JavaScript
+Import-Package: javax.xml.namespace,
+ org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.assembly.xml;version="2.0.0",
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.extensibility,
+ org.apache.tuscany.sca.monitor;version="2.0.0",
+ org.apache.tuscany.sca.runtime;version="2.0.0"
+Bundle-SymbolicName: org.apache.tuscany.sca.core.web.javascript.dojo
+Bundle-DocURL: http://www.apache.org/
+
Modified: tuscany/java/sca/modules/web-javascript-dojo/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/web-javascript-dojo/pom.xml?rev=836416&r1=836415&r2=836416&view=diff
==============================================================================
--- tuscany/java/sca/modules/web-javascript-dojo/pom.xml (original)
+++ tuscany/java/sca/modules/web-javascript-dojo/pom.xml Sun Nov 15 20:48:16
2009
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-modules</artifactId>
- <version>1.6-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -33,19 +33,19 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-core</artifactId>
- <version>1.6-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-host-http</artifactId>
- <version>1.6-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.4</version> <!-- to keep compatible with older servlet
containers -->
+ <version>2.5</version> <!-- to keep compatible with older servlet
containers -->
<scope>provided</scope>
</dependency>
Modified:
tuscany/java/sca/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoModuleActivator.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoModuleActivator.java?rev=836416&r1=836415&r2=836416&view=diff
==============================================================================
---
tuscany/java/sca/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoModuleActivator.java
(original)
+++
tuscany/java/sca/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoModuleActivator.java
Sun Nov 15 20:48:16 2009
@@ -34,12 +34,16 @@
private static final String tuscanyBaseUri =
URI.create("/tuscany").toString();
private static final String tuscanyUri =
URI.create("/tuscany/*").toString();
-
+
private ServletHost servletHost;
- public void start(ExtensionPointRegistry registry) {
+ public DojoModuleActivator(ExtensionPointRegistry registry) {
ServletHostExtensionPoint servletHosts =
registry.getExtensionPoint(ServletHostExtensionPoint.class);
- this.servletHost = servletHosts.getServletHosts().get(0);
+
+ this.servletHost = servletHosts.getServletHosts().get(0);
+ }
+
+ public void start() {
if (servletHost == null) {
throw new IllegalStateException("Can't find ServletHost reference
!");
@@ -67,7 +71,7 @@
}
- public void stop(ExtensionPointRegistry registry) {
+ public void stop() {
Servlet servlet = servletHost.getServletMapping(dojoBaseUri);
if(servlet != null) {
servletHost.removeServletMapping(dojoBaseUri);
@@ -80,5 +84,4 @@
servletHost = null;
}
-
}
Added: tuscany/java/sca/modules/web-javascript/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/web-javascript/META-INF/MANIFEST.MF?rev=836416&view=auto
==============================================================================
--- tuscany/java/sca/modules/web-javascript/META-INF/MANIFEST.MF (added)
+++ tuscany/java/sca/modules/web-javascript/META-INF/MANIFEST.MF Sun Nov 15
20:48:16 2009
@@ -0,0 +1,21 @@
+Manifest-Version: 1.0
+Tool: Bnd-0.0.357
+Bundle-Name: Apache Tuscany SCA Web JavaScript
+Created-By: 1.6.0_15 (Apple Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 2.0.0
+Bnd-LastModified: 1258084980430
+Bundle-ManifestVersion: 2
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: Apache Tuscany SCA Web JavaScript
+Import-Package: javax.xml.namespace,
+ org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.assembly.xml;version="2.0.0",
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.extensibility,
+ org.apache.tuscany.sca.monitor;version="2.0.0",
+ org.apache.tuscany.sca.runtime;version="2.0.0"
+Bundle-SymbolicName: org.apache.tuscany.sca.core.web.javascript
+Bundle-DocURL: http://www.apache.org/
+Export-Package: org.apache.tuscany.sca.web.javascript;version="2.0.0"
+
Modified: tuscany/java/sca/modules/web-javascript/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/web-javascript/pom.xml?rev=836416&r1=836415&r2=836416&view=diff
==============================================================================
--- tuscany/java/sca/modules/web-javascript/pom.xml (original)
+++ tuscany/java/sca/modules/web-javascript/pom.xml Sun Nov 15 20:48:16 2009
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-modules</artifactId>
- <version>1.6-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-core</artifactId>
- <version>1.6-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
@@ -42,26 +42,5 @@
<version>4.5</version>
<scope>test</scope>
</dependency>
-
</dependencies>
-
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Bundle-Version>${tuscany.version}</Bundle-Version>
-
<Bundle-SymbolicName>org.apache.tuscany.sca.core.web</Bundle-SymbolicName>
- <Bundle-Description>${pom.name}</Bundle-Description>
-
<Export-Package>org.apache.tuscany.sca.core.web</Export-Package>
-
<Import-Package>org.apache.tuscany.sca.assembly.xml;version="1.4",
*</Import-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
</project>
Modified:
tuscany/java/sca/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/DefaultComponentJavaScriptGeneratorExtensionPoint.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/DefaultComponentJavaScriptGeneratorExtensionPoint.java?rev=836416&r1=836415&r2=836416&view=diff
==============================================================================
---
tuscany/java/sca/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/DefaultComponentJavaScriptGeneratorExtensionPoint.java
(original)
+++
tuscany/java/sca/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/DefaultComponentJavaScriptGeneratorExtensionPoint.java
Sun Nov 15 20:48:16 2009
@@ -22,10 +22,10 @@
import java.io.IOException;
import java.lang.reflect.Constructor;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import javax.xml.namespace.QName;
@@ -35,9 +35,6 @@
import org.apache.tuscany.sca.extensibility.ServiceDiscovery;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.Problem.Severity;
-import org.apache.tuscany.sca.monitor.impl.ProblemImpl;
/**
@@ -72,10 +69,18 @@
* @param model
*/
private void error(String message, Object model, Exception ex) {
+ /*
if (monitor != null) {
- Problem problem = new ProblemImpl(this.getClass().getName(),
"web-javascript-validation-messages", Severity.ERROR, model, message, ex);
+ Problem problem =
+ monitor.createProblem(this.getClass().getName(),
+ Messages.RESOURCE_BUNDLE,
+ Severity.ERROR,
+ model,
+ message,
+ ex);
monitor.problem(problem);
- }
+ }
+ */
}
public void addComponentJavaScriptGenerator(ComponentJavaScriptGenerator
componentScriptGenerator) {
@@ -120,7 +125,7 @@
}
// Get the proxy factories declarations
- Set<ServiceDeclaration> factoryDeclarations = null;
+ Collection<ServiceDeclaration> factoryDeclarations = null;
try {
factoryDeclarations =
ServiceDiscovery.getInstance().getServiceDeclarations(ComponentJavaScriptGenerator.class);
} catch (IOException e) {
Modified:
tuscany/java/sca/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/DefaultJavascriptProxyFactoryExtensionPoint.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/DefaultJavascriptProxyFactoryExtensionPoint.java?rev=836416&r1=836415&r2=836416&view=diff
==============================================================================
---
tuscany/java/sca/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/DefaultJavascriptProxyFactoryExtensionPoint.java
(original)
+++
tuscany/java/sca/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/DefaultJavascriptProxyFactoryExtensionPoint.java
Sun Nov 15 20:48:16 2009
@@ -21,22 +21,19 @@
import java.io.IOException;
import java.lang.reflect.Constructor;
+import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
-import java.util.Set;
import javax.xml.namespace.QName;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
+import org.apache.tuscany.sca.core.FactoryExtensionPoint;
import org.apache.tuscany.sca.core.UtilityExtensionPoint;
import org.apache.tuscany.sca.extensibility.ServiceDeclaration;
import org.apache.tuscany.sca.extensibility.ServiceDiscovery;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.Problem.Severity;
-import org.apache.tuscany.sca.monitor.impl.ProblemImpl;
/**
* Default extension point for javascript proxy factories
@@ -67,10 +64,18 @@
* @param model
*/
private void error(String message, Object model, Exception ex) {
+ /*
if (monitor != null) {
- Problem problem = new ProblemImpl(this.getClass().getName(),
"web-javascript-validation-messages", Severity.ERROR, model, message, ex);
+ Problem problem =
+ monitor.createProblem(this.getClass().getName(),
+ Messages.RESOURCE_BUNDLE,
+ Severity.WARNING,
+ model,
+ message,
+ (Object[])messageParameters);
monitor.problem(problem);
- }
+ }
+ */
}
public void addProxyFactory(JavascriptProxyFactory javascriptProxyfactory)
{
@@ -111,7 +116,7 @@
if (bindingType.isInterface()) {
// Dynamically load a factory class declared under
META-INF/services
try {
- Class<?> factoryClass =
ServiceDiscovery.getInstance().loadFirstServiceClass(bindingType);
+ Class<?> factoryClass =
ServiceDiscovery.getInstance().getServiceDeclaration(bindingType).getClass();
if (factoryClass != null) {
try {
@@ -121,7 +126,7 @@
} catch (NoSuchMethodException e) {
// Constructor taking the model factory extension point
- Constructor<?> constructor =
factoryClass.getConstructor(ModelFactoryExtensionPoint.class);
+ Constructor<?> constructor =
factoryClass.getConstructor(FactoryExtensionPoint.class);
factory = (JavascriptProxyFactory)
constructor.newInstance(this);
}
@@ -135,7 +140,7 @@
// Call the newInstance static method on the factory abstract class
try {
- factory = (JavascriptProxyFactory)
ServiceDiscovery.getInstance().newFactoryClassInstance(bindingType);
+ factory = (JavascriptProxyFactory)
ServiceDiscovery.getInstance().getServiceDeclaration(bindingType);
} catch (Exception e) {
throw new IllegalArgumentException(e);
}
@@ -186,7 +191,7 @@
}
// Get the proxy factories declarations
- Set<ServiceDeclaration> factoryDeclarations = null;
+ Collection<ServiceDeclaration> factoryDeclarations = null;
try {
factoryDeclarations =
ServiceDiscovery.getInstance().getServiceDeclarations(JavascriptProxyFactory.class);
} catch (IOException e) {
