You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2007/03/19 18:52:01 UTC
svn commit: r520026 - in
/incubator/tuscany/java/sca/services/databinding/databinding-sdo/src:
main/java/org/apache/tuscany/databinding/sdo/
main/java/org/apache/tuscany/databinding/sdo/api/
main/resources/META-INF/sca/ test/java/org/apache/tuscany/dat...
Author: rfeng
Date: Mon Mar 19 10:52:00 2007
New Revision: 520026
URL: http://svn.apache.org/viewvc?view=rev&rev=520026
Log:
Expose SDO HelperContext as a resource
Added:
incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DuplicateHelperContextException.java (with props)
incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/HelperContextRegistry.java (with props)
incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/HelperContextRegistryImpl.java (with props)
incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/api/
incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/api/HelperContext.java
- copied, changed from r520013, incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/HelperContext.java
Removed:
incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/HelperContext.java
Modified:
incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/HelperContextProcessor.java
incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ImportSDOLoader.java
incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/resources/META-INF/sca/databinding.sdo.scdl
incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/ImportSDOLoaderTestCase.java
Added: incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DuplicateHelperContextException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DuplicateHelperContextException.java?view=auto&rev=520026
==============================================================================
--- incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DuplicateHelperContextException.java (added)
+++ incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DuplicateHelperContextException.java Mon Mar 19 10:52:00 2007
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tuscany.databinding.sdo;
+
+import org.apache.tuscany.spi.CoreRuntimeException;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class DuplicateHelperContextException extends CoreRuntimeException {
+ private static final long serialVersionUID = -5229624905543066038L;
+
+ /**
+ * Constructor specifying message and the ID of the duplicate HelperContext.
+ *
+ * @param message exception message
+ * @param identifier the id of the HelperContext that is already present
+ */
+ public DuplicateHelperContextException(String message, String identifier) {
+ super(message, identifier);
+ }
+}
Propchange: incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DuplicateHelperContextException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DuplicateHelperContextException.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/HelperContextProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/HelperContextProcessor.java?view=diff&rev=520026&r1=520025&r2=520026
==============================================================================
--- incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/HelperContextProcessor.java (original)
+++ incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/HelperContextProcessor.java Mon Mar 19 10:52:00 2007
@@ -32,7 +32,7 @@
import org.apache.tuscany.spi.implementation.java.PojoComponentType;
import org.apache.tuscany.spi.implementation.java.ProcessingException;
import org.apache.tuscany.spi.implementation.java.Resource;
-import org.osoa.sca.annotations.Context;
+import org.osoa.sca.annotations.Reference;
import commonj.sdo.helper.HelperContext;
@@ -44,6 +44,15 @@
* @version $Rev$ $Date$
*/
public class HelperContextProcessor extends ImplementationProcessorExtension {
+ private HelperContextRegistry registry;
+
+ /**
+ * @param registry
+ */
+ public HelperContextProcessor(@Reference HelperContextRegistry registry) {
+ super();
+ this.registry = registry;
+ }
/**
* Takes a setter or getter method name and converts it to a property name
@@ -60,7 +69,7 @@
public void visitMethod(Method method,
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
DeploymentContext context) throws ProcessingException {
- if (!method.isAnnotationPresent(Context.class)) {
+ if (!method.isAnnotationPresent(org.apache.tuscany.databinding.sdo.api.HelperContext.class)) {
return;
}
if (method.getParameterTypes().length != 1) {
@@ -78,7 +87,7 @@
public void visitField(Field field,
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
DeploymentContext context) throws ProcessingException {
- if (field.getAnnotation(Context.class) == null) {
+ if (!field.isAnnotationPresent(org.apache.tuscany.databinding.sdo.api.HelperContext.class)) {
return;
}
Class<?> paramType = field.getType();
@@ -90,16 +99,16 @@
}
}
- private static class HelperContextFactory implements ObjectFactory<HelperContext> {
- private URI parent;
+ private class HelperContextFactory implements ObjectFactory<HelperContext> {
+ private URI id;
- public HelperContextFactory(URI parent) {
+ public HelperContextFactory(URI id) {
super();
- this.parent = parent;
+ this.id = id;
}
public HelperContext getInstance() throws ObjectCreationException {
- return null;
+ return registry.getHelperContext(id);
}
}
Added: incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/HelperContextRegistry.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/HelperContextRegistry.java?view=auto&rev=520026
==============================================================================
--- incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/HelperContextRegistry.java (added)
+++ incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/HelperContextRegistry.java Mon Mar 19 10:52:00 2007
@@ -0,0 +1,54 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.tuscany.databinding.sdo;
+
+import java.net.URI;
+
+import commonj.sdo.helper.HelperContext;
+
+/**
+ * A registry for SDO HelperContext
+ *
+ * @version $Rev$ $Date$
+ */
+public interface HelperContextRegistry {
+ /**
+ * Register a HelperContext with the id
+ *
+ * @param id
+ * @param context
+ */
+ void register(URI id, HelperContext context) throws DuplicateHelperContextException;
+
+ /**
+ * Unregister the HelperContext
+ *
+ * @param id
+ */
+ void unregister(URI id);
+
+ /**
+ * Get the HelperContext associated with the id
+ *
+ * @param id The URI of the HelperContext
+ * @return
+ */
+ HelperContext getHelperContext(URI id);
+}
Propchange: incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/HelperContextRegistry.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/HelperContextRegistry.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/HelperContextRegistryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/HelperContextRegistryImpl.java?view=auto&rev=520026
==============================================================================
--- incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/HelperContextRegistryImpl.java (added)
+++ incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/HelperContextRegistryImpl.java Mon Mar 19 10:52:00 2007
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.tuscany.databinding.sdo;
+
+import java.net.URI;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import commonj.sdo.helper.HelperContext;
+
+/**
+ * A registry for SDO HelperContext
+ *
+ * @version $Rev$ $Date$
+ */
+public class HelperContextRegistryImpl implements HelperContextRegistry {
+ private final Map<URI, HelperContext> registry = new ConcurrentHashMap<URI, HelperContext>();
+
+ public synchronized void register(URI id, HelperContext context) {
+ if (registry.containsKey(id)) {
+ throw new DuplicateHelperContextException("Duplicate HelperContext", id.toString());
+ }
+ registry.put(id, context);
+ }
+
+ public void unregister(URI id) {
+ registry.remove(id);
+ }
+
+ public HelperContext getHelperContext(URI id) {
+ return registry.get(id);
+ }
+}
Propchange: incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/HelperContextRegistryImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/HelperContextRegistryImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ImportSDOLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ImportSDOLoader.java?view=diff&rev=520026&r1=520025&r2=520026
==============================================================================
--- incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ImportSDOLoader.java (original)
+++ incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ImportSDOLoader.java Mon Mar 19 10:52:00 2007
@@ -31,6 +31,7 @@
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
+import org.apache.tuscany.sdo.util.SDOUtil;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.LoaderExtension;
import org.apache.tuscany.spi.loader.LoaderException;
@@ -50,10 +51,12 @@
* @version $Rev$ $Date$
*/
public class ImportSDOLoader extends LoaderExtension {
-
- @Constructor({"registry"})
- public ImportSDOLoader(@Reference LoaderRegistry registry) {
+ private HelperContextRegistry helperContextRegistry;
+
+ @Constructor({"registry", "helperContextRegistry"})
+ public ImportSDOLoader(@Reference LoaderRegistry registry, @Reference HelperContextRegistry helperContextRegistry) {
super(registry);
+ this.helperContextRegistry = helperContextRegistry;
}
public QName getXMLType() {
@@ -65,9 +68,16 @@
DeploymentContext deploymentContext) throws XMLStreamException, LoaderException {
assert IMPORT_SDO.equals(reader.getName());
+ HelperContext helperContext = null;
// FIXME: [rfeng] How to associate the TypeHelper with deployment
// context?
- HelperContext helperContext = SDOContextHelper.getHelperContext(object);
+ synchronized (helperContextRegistry) {
+ helperContext = helperContextRegistry.getHelperContext(deploymentContext.getComponentId());
+ if (helperContext == null) {
+ helperContext = SDOUtil.createHelperContext();
+ helperContextRegistry.register(deploymentContext.getComponentId(), helperContext);
+ }
+ }
importFactory(reader, deploymentContext, helperContext);
importWSDL(reader, deploymentContext, helperContext);
Copied: incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/api/HelperContext.java (from r520013, incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/HelperContext.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/api/HelperContext.java?view=diff&rev=520026&p1=incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/HelperContext.java&r1=520013&p2=incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/api/HelperContext.java&r2=520026
==============================================================================
--- incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/HelperContext.java (original)
+++ incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/api/HelperContext.java Mon Mar 19 10:52:00 2007
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.databinding.sdo;
+package org.apache.tuscany.databinding.sdo.api;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
@@ -24,13 +24,13 @@
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
-
/**
- * To be injected with SDO HelperContext
+ * This annotation can be used by component implementation class to receive the
+ * SDO HelperContext.
*
* @version $Rev$ $Date$
*/
-@Target({METHOD, FIELD})
+@Target( {METHOD, FIELD})
@Retention(RUNTIME)
public @interface HelperContext {
-}
\ No newline at end of file
+}
Modified: incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/resources/META-INF/sca/databinding.sdo.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/resources/META-INF/sca/databinding.sdo.scdl?view=diff&rev=520026&r1=520025&r2=520026
==============================================================================
--- incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/resources/META-INF/sca/databinding.sdo.scdl (original)
+++ incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/resources/META-INF/sca/databinding.sdo.scdl Mon Mar 19 10:52:00 2007
@@ -68,4 +68,8 @@
<system:implementation.system class="org.apache.tuscany.databinding.sdo.HelperContextProcessor" />
</component>
+ <component name="helperContext.registry">
+ <system:implementation.system class="org.apache.tuscany.databinding.sdo.HelperContextRegistryImpl" />
+ </component>
+
</composite>
Modified: incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/ImportSDOLoaderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/ImportSDOLoaderTestCase.java?view=diff&rev=520026&r1=520025&r2=520026
==============================================================================
--- incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/ImportSDOLoaderTestCase.java (original)
+++ incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/ImportSDOLoaderTestCase.java Mon Mar 19 10:52:00 2007
@@ -18,7 +18,11 @@
*/
package org.apache.tuscany.databinding.sdo;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
+
import java.io.StringReader;
+import java.net.URI;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamException;
@@ -55,8 +59,7 @@
}
public void testFactory() throws XMLStreamException, LoaderException {
- String xml = "<import.sdo xmlns='http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0' "
- + "factory='org.apache.tuscany.databinding.sdo.ImportSDOLoaderTestCase$MockFactory'/>";
+ String xml = "<import.sdo xmlns='http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0' " + "factory='org.apache.tuscany.databinding.sdo.ImportSDOLoaderTestCase$MockFactory'/>";
XMLStreamReader reader = getReader(xml);
assertFalse(inited);
assertTrue(loader.load(null, reader, deploymentContext) instanceof ImportSDO);
@@ -65,12 +68,14 @@
protected void setUp() throws Exception {
super.setUp();
- loader = new ImportSDOLoader(null);
+ URI id = URI.create("/composite1/");
+ loader = new ImportSDOLoader(null, new HelperContextRegistryImpl());
xmlFactory = XMLInputFactory.newInstance();
deploymentContext = EasyMock.createMock(DeploymentContext.class);
- EasyMock.expect(deploymentContext.getXmlFactory()).andReturn(xmlFactory).anyTimes();
- EasyMock.expect(deploymentContext.getClassLoader()).andReturn(getClass().getClassLoader()).anyTimes();
- EasyMock.replay(deploymentContext);
+ expect(deploymentContext.getXmlFactory()).andReturn(xmlFactory).anyTimes();
+ expect(deploymentContext.getComponentId()).andReturn(id).anyTimes();
+ expect(deploymentContext.getClassLoader()).andReturn(getClass().getClassLoader()).anyTimes();
+ replay(deploymentContext);
}
protected XMLStreamReader getReader(String xml) throws XMLStreamException {
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org