You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2007/08/20 07:13:50 UTC
svn commit: r567542 [5/7] - in /incubator/tuscany/java/sca/modules:
assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/
assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/
assembly/src/main/java/org/apache/tuscany/sca/assembly/i...
Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2Node.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2Node.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2Node.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2Node.java Sun Aug 19 22:13:29 2007
@@ -42,14 +42,17 @@
}
}
+ @Override
public Class getSourceType() {
return String.class;
}
+ @Override
public Class getTargetType() {
return Node.class;
}
+ @Override
public int getWeight() {
return 50;
}
Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SAX.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SAX.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SAX.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SAX.java Sun Aug 19 22:13:29 2007
@@ -41,14 +41,17 @@
}
}
+ @Override
public Class getSourceType() {
return String.class;
}
+ @Override
public Class getTargetType() {
return ContentHandler.class;
}
+ @Override
public int getWeight() {
return 40;
}
Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2XMLStreamReader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2XMLStreamReader.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2XMLStreamReader.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2XMLStreamReader.java Sun Aug 19 22:13:29 2007
@@ -37,14 +37,17 @@
}
}
+ @Override
public Class getSourceType() {
return String.class;
}
+ @Override
public Class getTargetType() {
return XMLStreamReader.class;
}
+ @Override
public int getWeight() {
return 50;
}
Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Writer2ReaderDataPipe.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Writer2ReaderDataPipe.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Writer2ReaderDataPipe.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Writer2ReaderDataPipe.java Sun Aug 19 22:13:29 2007
@@ -33,14 +33,17 @@
return new Pipe();
}
+ @Override
public Class getTargetType() {
return Reader.class;
}
+ @Override
public int getWeight() {
return 50;
}
+ @Override
public Class getSourceType() {
return Writer.class;
}
Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReaderImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReaderImpl.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReaderImpl.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReaderImpl.java Sun Aug 19 22:13:29 2007
@@ -174,7 +174,7 @@
if (attribPointer == null) {
throw new UnsupportedOperationException();
} else if (attribPointer instanceof QName) {
- return (QName)attribPointer;
+ return attribPointer;
} else {
return null;
}
@@ -650,7 +650,7 @@
* Get the prefix list from the hastable and take that into an array
*/
private String[] makePrefixArray() {
- String[] prefixes = (String[])declaredNamespaceMap.keySet().toArray(new String[declaredNamespaceMap.size()]);
+ String[] prefixes = declaredNamespaceMap.keySet().toArray(new String[declaredNamespaceMap.size()]);
Arrays.sort(prefixes);
return prefixes;
}
Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2Node.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2Node.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2Node.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2Node.java Sun Aug 19 22:13:29 2007
@@ -48,14 +48,17 @@
}
}
+ @Override
public Class getSourceType() {
return XMLStreamReader.class;
}
+ @Override
public Class getTargetType() {
return Node.class;
}
+ @Override
public int getWeight() {
return 40;
}
Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2SAX.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2SAX.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2SAX.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2SAX.java Sun Aug 19 22:13:29 2007
@@ -35,6 +35,7 @@
/**
* @see org.apache.tuscany.sca.databinding.PushTransformer#getSourceType()
*/
+ @Override
public Class getTargetType() {
return ContentHandler.class;
}
@@ -42,6 +43,7 @@
/**
* @see org.apache.tuscany.sca.databinding.PushTransformer#getSourceType()
*/
+ @Override
public Class getSourceType() {
return XMLStreamReader.class;
}
@@ -49,6 +51,7 @@
/**
* @see org.apache.tuscany.sca.databinding.PushTransformer#getWeight()
*/
+ @Override
public int getWeight() {
return 20;
}
Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2String.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2String.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2String.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2String.java Sun Aug 19 22:13:29 2007
@@ -39,14 +39,17 @@
}
}
+ @Override
public Class getSourceType() {
return XMLStreamReader.class;
}
+ @Override
public Class getTargetType() {
return String.class;
}
+ @Override
public int getWeight() {
return 40;
}
Modified: incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DOMHelperTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DOMHelperTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DOMHelperTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DOMHelperTestCase.java Sun Aug 19 22:13:29 2007
@@ -37,6 +37,7 @@
/**
* @see junit.framework.TestCase#setUp()
*/
+ @Override
protected void setUp() throws Exception {
super.setUp();
}
Modified: incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DataBindingExtensionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DataBindingExtensionTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DataBindingExtensionTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DataBindingExtensionTestCase.java Sun Aug 19 22:13:29 2007
@@ -37,6 +37,7 @@
/**
* @see junit.framework.TestCase#setUp()
*/
+ @Override
protected void setUp() throws Exception {
super.setUp();
}
Modified: incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/SimpleTypeMapperExtensionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/SimpleTypeMapperExtensionTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/SimpleTypeMapperExtensionTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/SimpleTypeMapperExtensionTestCase.java Sun Aug 19 22:13:29 2007
@@ -81,6 +81,7 @@
/**
* @see junit.framework.TestCase#setUp()
*/
+ @Override
protected void setUp() throws Exception {
super.setUp();
}
Modified: incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/TransformerExtensionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/TransformerExtensionTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/TransformerExtensionTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/TransformerExtensionTestCase.java Sun Aug 19 22:13:29 2007
@@ -37,6 +37,7 @@
/**
* @see junit.framework.TestCase#setUp()
*/
+ @Override
protected void setUp() throws Exception {
super.setUp();
}
Modified: incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/XSDDataTypeConverterTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/XSDDataTypeConverterTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/XSDDataTypeConverterTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/XSDDataTypeConverterTestCase.java Sun Aug 19 22:13:29 2007
@@ -35,6 +35,7 @@
/**
* @see junit.framework.TestCase#setUp()
*/
+ @Override
protected void setUp() throws Exception {
super.setUp();
}
@@ -54,7 +55,7 @@
Calendar calendar = new GregorianCalendar();
String s = c.printDate(calendar);
- calendar = (GregorianCalendar)c.parseDate(s);
+ calendar = c.parseDate(s);
assertEquals(s, c.printDate(calendar));
}
Modified: incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingRegistryImplTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingRegistryImplTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingRegistryImplTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingRegistryImplTestCase.java Sun Aug 19 22:13:29 2007
@@ -45,6 +45,7 @@
/**
* @see junit.framework.TestCase#setUp()
*/
+ @Override
protected void setUp() throws Exception {
super.setUp();
registry = new DefaultDataBindingExtensionPoint();
Modified: incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DirectedGraphTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DirectedGraphTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DirectedGraphTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DirectedGraphTestCase.java Sun Aug 19 22:13:29 2007
@@ -29,6 +29,7 @@
public class DirectedGraphTestCase extends TestCase {
private DirectedGraph<String, Object> graph;
+ @Override
protected void setUp() throws Exception {
super.setUp();
graph = new DirectedGraph<String, Object>();
@@ -82,6 +83,7 @@
}
+ @Override
protected void tearDown() throws Exception {
super.tearDown();
}
Modified: incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/MediatorImplTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/MediatorImplTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/MediatorImplTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/MediatorImplTestCase.java Sun Aug 19 22:13:29 2007
@@ -75,6 +75,7 @@
private MediatorImpl mediator;
+ @Override
protected void setUp() throws Exception {
super.setUp();
Modified: incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/TransformerRegistryImplTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/TransformerRegistryImplTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/TransformerRegistryImplTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/TransformerRegistryImplTestCase.java Sun Aug 19 22:13:29 2007
@@ -41,6 +41,7 @@
/**
* @see junit.framework.TestCase#setUp()
*/
+ @Override
protected void setUp() throws Exception {
super.setUp();
registry = new DefaultTransformerExtensionPoint();
Modified: incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DOM2StAXTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DOM2StAXTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DOM2StAXTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DOM2StAXTestCase.java Sun Aug 19 22:13:29 2007
@@ -62,6 +62,7 @@
/**
* @see junit.framework.TestCase#setUp()
*/
+ @Override
protected void setUp() throws Exception {
super.setUp();
}
Modified: incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/JavaBean2XMLStreamReaderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/JavaBean2XMLStreamReaderTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/JavaBean2XMLStreamReaderTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/JavaBean2XMLStreamReaderTestCase.java Sun Aug 19 22:13:29 2007
@@ -28,6 +28,7 @@
/**
* @see junit.framework.TestCase#setUp()
*/
+ @Override
protected void setUp() throws Exception {
super.setUp();
}
Modified: incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/PushTransformationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/PushTransformationTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/PushTransformationTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/PushTransformationTestCase.java Sun Aug 19 22:13:29 2007
@@ -61,6 +61,7 @@
/**
* @see junit.framework.TestCase#setUp()
*/
+ @Override
protected void setUp() throws Exception {
super.setUp();
}
Modified: incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/StAXHelperTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/StAXHelperTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/StAXHelperTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/StAXHelperTestCase.java Sun Aug 19 22:13:29 2007
@@ -34,6 +34,7 @@
/**
* @see junit.framework.TestCase#setUp()
*/
+ @Override
protected void setUp() throws Exception {
super.setUp();
}
Modified: incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/TraxTransformerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/TraxTransformerTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/TraxTransformerTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/TraxTransformerTestCase.java Sun Aug 19 22:13:29 2007
@@ -45,6 +45,7 @@
/**
* @see junit.framework.TestCase#setUp()
*/
+ @Override
protected void setUp() throws Exception {
super.setUp();
url = getClass().getResource("foo.xml");
Modified: incubator/tuscany/java/sca/modules/distributed-impl/src/main/java/org/apache/tuscany/sca/distributed/domain/impl/DistributedSCADomainMemoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/distributed-impl/src/main/java/org/apache/tuscany/sca/distributed/domain/impl/DistributedSCADomainMemoryImpl.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/distributed-impl/src/main/java/org/apache/tuscany/sca/distributed/domain/impl/DistributedSCADomainMemoryImpl.java (original)
+++ incubator/tuscany/java/sca/modules/distributed-impl/src/main/java/org/apache/tuscany/sca/distributed/domain/impl/DistributedSCADomainMemoryImpl.java Sun Aug 19 22:13:29 2007
@@ -21,7 +21,6 @@
import org.apache.tuscany.sca.distributed.management.ServiceDiscovery;
import org.apache.tuscany.sca.distributed.management.impl.ServiceDiscoveryMemoryImpl;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
/**
* A local representation of the sca domain distributed across a number
@@ -42,6 +41,7 @@
}
}
+ @Override
public ServiceDiscovery getServiceDiscovery(){
return serviceDiscovery;
}
Modified: incubator/tuscany/java/sca/modules/distributed-impl/src/main/java/org/apache/tuscany/sca/distributed/domain/impl/DistributedSCADomainNetworkImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/distributed-impl/src/main/java/org/apache/tuscany/sca/distributed/domain/impl/DistributedSCADomainNetworkImpl.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/distributed-impl/src/main/java/org/apache/tuscany/sca/distributed/domain/impl/DistributedSCADomainNetworkImpl.java (original)
+++ incubator/tuscany/java/sca/modules/distributed-impl/src/main/java/org/apache/tuscany/sca/distributed/domain/impl/DistributedSCADomainNetworkImpl.java Sun Aug 19 22:13:29 2007
@@ -20,9 +20,6 @@
package org.apache.tuscany.sca.distributed.domain.impl;
import org.apache.tuscany.sca.distributed.management.ServiceDiscovery;
-import org.apache.tuscany.sca.distributed.management.impl.ServiceDiscoveryMemoryImpl;
-import org.apache.tuscany.sca.distributed.management.impl.ServiceDiscoveryNetworkImpl;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
/**
* Represents the network services and clients for the domain running on a node
@@ -39,6 +36,7 @@
super(domainName);
}
+ @Override
public ServiceDiscovery getServiceDiscovery(){
if (serviceDiscovery == null){
Modified: incubator/tuscany/java/sca/modules/distributed-impl/src/main/java/org/apache/tuscany/sca/distributed/management/impl/DistributedDomainManagerMemoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/distributed-impl/src/main/java/org/apache/tuscany/sca/distributed/management/impl/DistributedDomainManagerMemoryImpl.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/distributed-impl/src/main/java/org/apache/tuscany/sca/distributed/management/impl/DistributedDomainManagerMemoryImpl.java (original)
+++ incubator/tuscany/java/sca/modules/distributed-impl/src/main/java/org/apache/tuscany/sca/distributed/management/impl/DistributedDomainManagerMemoryImpl.java Sun Aug 19 22:13:29 2007
@@ -23,9 +23,6 @@
import java.util.List;
import org.apache.tuscany.sca.distributed.management.DistributedDomainManager;
-import org.apache.tuscany.sca.distributed.management.ServiceDiscovery;
-import org.apache.tuscany.sca.distributed.management.impl.ServiceDiscoveryMemoryImpl.ServiceEndpoint;
-import org.osoa.sca.annotations.Reference;
/**
@@ -48,6 +45,7 @@
this.nodeManagementUri = nodeManagementUri;
}
+ @Override
public String toString (){
return "[" +
domainUri + " " +
Modified: incubator/tuscany/java/sca/modules/distributed-impl/src/main/java/org/apache/tuscany/sca/distributed/management/impl/DistributedDomainManagerNetworkImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/distributed-impl/src/main/java/org/apache/tuscany/sca/distributed/management/impl/DistributedDomainManagerNetworkImpl.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/distributed-impl/src/main/java/org/apache/tuscany/sca/distributed/management/impl/DistributedDomainManagerNetworkImpl.java (original)
+++ incubator/tuscany/java/sca/modules/distributed-impl/src/main/java/org/apache/tuscany/sca/distributed/management/impl/DistributedDomainManagerNetworkImpl.java Sun Aug 19 22:13:29 2007
@@ -19,12 +19,7 @@
package org.apache.tuscany.sca.distributed.management.impl;
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.tuscany.sca.distributed.management.DistributedDomainManager;
-import org.apache.tuscany.sca.distributed.management.ServiceDiscovery;
-import org.apache.tuscany.sca.distributed.management.impl.ServiceDiscoveryMemoryImpl.ServiceEndpoint;
import org.osoa.sca.annotations.Reference;
Modified: incubator/tuscany/java/sca/modules/distributed-impl/src/main/java/org/apache/tuscany/sca/distributed/management/impl/ServiceDiscoveryMemoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/distributed-impl/src/main/java/org/apache/tuscany/sca/distributed/management/impl/ServiceDiscoveryMemoryImpl.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/distributed-impl/src/main/java/org/apache/tuscany/sca/distributed/management/impl/ServiceDiscoveryMemoryImpl.java (original)
+++ incubator/tuscany/java/sca/modules/distributed-impl/src/main/java/org/apache/tuscany/sca/distributed/management/impl/ServiceDiscoveryMemoryImpl.java Sun Aug 19 22:13:29 2007
@@ -61,6 +61,7 @@
return url;
}
+ @Override
public String toString (){
return "[" +
domainUri + " " +
Modified: incubator/tuscany/java/sca/modules/distributed-impl/src/main/java/org/apache/tuscany/sca/distributed/management/impl/ServiceDiscoveryNetworkImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/distributed-impl/src/main/java/org/apache/tuscany/sca/distributed/management/impl/ServiceDiscoveryNetworkImpl.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/distributed-impl/src/main/java/org/apache/tuscany/sca/distributed/management/impl/ServiceDiscoveryNetworkImpl.java (original)
+++ incubator/tuscany/java/sca/modules/distributed-impl/src/main/java/org/apache/tuscany/sca/distributed/management/impl/ServiceDiscoveryNetworkImpl.java Sun Aug 19 22:13:29 2007
@@ -19,15 +19,6 @@
package org.apache.tuscany.sca.distributed.management.impl;
-import javax.xml.namespace.QName;
-
-import org.apache.axiom.om.OMAbstractFactory;
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.OMNamespace;
-import org.apache.axis2.addressing.EndpointReference;
-import org.apache.axis2.client.Options;
-import org.apache.axis2.rpc.client.RPCServiceClient;
import org.apache.tuscany.sca.distributed.management.ServiceDiscovery;
import org.osoa.sca.annotations.Reference;
Modified: incubator/tuscany/java/sca/modules/distributed-impl/src/test/java/org/apache/tuscany/sca/distributed/impl/InMemoryTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/distributed-impl/src/test/java/org/apache/tuscany/sca/distributed/impl/InMemoryTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/distributed-impl/src/test/java/org/apache/tuscany/sca/distributed/impl/InMemoryTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/distributed-impl/src/test/java/org/apache/tuscany/sca/distributed/impl/InMemoryTestCase.java Sun Aug 19 22:13:29 2007
@@ -27,7 +27,6 @@
private static EmbeddedNode nodeB;
private static SCADomain domainB;
private static EmbeddedNode nodeC;
- private static SCADomain domainC;
private static CalculatorService calculatorServiceA;
private static CalculatorService calculatorServiceB;
@@ -53,7 +52,7 @@
// create the node that runs the
// subtract component
nodeC = new EmbeddedNode("nodeC");
- domainC = nodeC.attachDomain(distributedDomain);
+ nodeC.attachDomain(distributedDomain);
nodeC.addContribution(DEFULT_DOMAIN_NAME, null);
Modified: incubator/tuscany/java/sca/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/BaseUriMap.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/BaseUriMap.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/BaseUriMap.java (original)
+++ incubator/tuscany/java/sca/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/BaseUriMap.java Sun Aug 19 22:13:29 2007
@@ -19,8 +19,6 @@
package org.apache.tuscany.sca.distributed.management;
-import java.util.List;
-
/**
* Represents the mapping between protocols and baseuris for a given domain
Modified: incubator/tuscany/java/sca/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/ComponentManager.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/ComponentManager.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/ComponentManager.java (original)
+++ incubator/tuscany/java/sca/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/ComponentManager.java Sun Aug 19 22:13:29 2007
@@ -19,8 +19,6 @@
package org.apache.tuscany.sca.distributed.management;
-import java.util.List;
-
/**
* A management interface for components in the distributed domain
Modified: incubator/tuscany/java/sca/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/ContributionManager.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/ContributionManager.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/ContributionManager.java (original)
+++ incubator/tuscany/java/sca/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/ContributionManager.java Sun Aug 19 22:13:29 2007
@@ -19,8 +19,6 @@
package org.apache.tuscany.sca.distributed.management;
-import java.util.List;
-
/**
* A management interface for contributions in the distributed domain
Modified: incubator/tuscany/java/sca/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/DistributedDomainManager.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/DistributedDomainManager.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/DistributedDomainManager.java (original)
+++ incubator/tuscany/java/sca/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/DistributedDomainManager.java Sun Aug 19 22:13:29 2007
@@ -19,8 +19,6 @@
package org.apache.tuscany.sca.distributed.management;
-import java.util.List;
-
import org.osoa.sca.annotations.Remotable;
Modified: incubator/tuscany/java/sca/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/DomainNodeManager.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/DomainNodeManager.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/DomainNodeManager.java (original)
+++ incubator/tuscany/java/sca/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/DomainNodeManager.java Sun Aug 19 22:13:29 2007
@@ -19,8 +19,6 @@
package org.apache.tuscany.sca.distributed.management;
-import java.util.List;
-
/**
* The management interface for the part of the distributed domain that
Modified: incubator/tuscany/java/sca/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/NodeManager.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/NodeManager.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/NodeManager.java (original)
+++ incubator/tuscany/java/sca/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/NodeManager.java Sun Aug 19 22:13:29 2007
@@ -19,8 +19,6 @@
package org.apache.tuscany.sca.distributed.management;
-import java.util.List;
-
/**
* The management interface for a node
Modified: incubator/tuscany/java/sca/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/ServiceDiscovery.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/ServiceDiscovery.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/ServiceDiscovery.java (original)
+++ incubator/tuscany/java/sca/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/management/ServiceDiscovery.java Sun Aug 19 22:13:29 2007
@@ -19,7 +19,6 @@
package org.apache.tuscany.sca.distributed.management;
-import java.util.List;
import org.osoa.sca.annotations.Remotable;
Modified: incubator/tuscany/java/sca/modules/extension-helper/src/main/java/org/apache/tuscany/sca/spi/impl/SCDLProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/extension-helper/src/main/java/org/apache/tuscany/sca/spi/impl/SCDLProcessor.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/extension-helper/src/main/java/org/apache/tuscany/sca/spi/impl/SCDLProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/extension-helper/src/main/java/org/apache/tuscany/sca/spi/impl/SCDLProcessor.java Sun Aug 19 22:13:29 2007
@@ -45,7 +45,6 @@
import org.apache.tuscany.sca.assembly.Service;
import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.resolver.impl.ModelResolverImpl;
import org.apache.tuscany.sca.contribution.service.ContributionReadException;
import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
@@ -178,6 +177,7 @@
public void write(Implementation arg0, XMLStreamWriter arg1) throws ContributionWriteException, XMLStreamException {
}
+ @Override
protected void addSideFileComponentType(String name, Implementation impl, ModelResolver resolver) {
// protected void addSideFileComponentType(Implementation impl, ModelResolver resolver) {
Modified: incubator/tuscany/java/sca/modules/extension-helper/src/main/java/org/apache/tuscany/sca/spi/utils/AbstractBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/extension-helper/src/main/java/org/apache/tuscany/sca/spi/utils/AbstractBinding.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/extension-helper/src/main/java/org/apache/tuscany/sca/spi/utils/AbstractBinding.java (original)
+++ incubator/tuscany/java/sca/modules/extension-helper/src/main/java/org/apache/tuscany/sca/spi/utils/AbstractBinding.java Sun Aug 19 22:13:29 2007
@@ -19,12 +19,9 @@
package org.apache.tuscany.sca.spi.utils;
-import java.util.ArrayList;
import java.util.List;
import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.policy.Intent;
-import org.apache.tuscany.sca.policy.PolicySet;
/**
* Helper for implementing Bindings, implements all the
Modified: incubator/tuscany/java/sca/modules/extension-helper/src/main/java/org/apache/tuscany/sca/spi/utils/AbstractImplementation.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/extension-helper/src/main/java/org/apache/tuscany/sca/spi/utils/AbstractImplementation.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/extension-helper/src/main/java/org/apache/tuscany/sca/spi/utils/AbstractImplementation.java (original)
+++ incubator/tuscany/java/sca/modules/extension-helper/src/main/java/org/apache/tuscany/sca/spi/utils/AbstractImplementation.java Sun Aug 19 22:13:29 2007
@@ -27,9 +27,6 @@
import org.apache.tuscany.sca.assembly.Property;
import org.apache.tuscany.sca.assembly.Reference;
import org.apache.tuscany.sca.assembly.Service;
-import org.apache.tuscany.sca.policy.Intent;
-import org.apache.tuscany.sca.policy.IntentAttachPointType;
-import org.apache.tuscany.sca.policy.PolicySet;
/**
* Helper for implementing Implementations, implements all the
Modified: incubator/tuscany/java/sca/modules/extension-helper/src/main/java/org/apache/tuscany/sca/spi/utils/AbstractStAXArtifactProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/extension-helper/src/main/java/org/apache/tuscany/sca/spi/utils/AbstractStAXArtifactProcessor.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/extension-helper/src/main/java/org/apache/tuscany/sca/spi/utils/AbstractStAXArtifactProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/extension-helper/src/main/java/org/apache/tuscany/sca/spi/utils/AbstractStAXArtifactProcessor.java Sun Aug 19 22:13:29 2007
@@ -98,6 +98,7 @@
dynamicService.setName("$dynamic$");
InterfaceContract dynamicInterfaceContract = new InterfaceContractImpl() {};
Interface dynamicInterface = new InterfaceImpl() {
+ @Override
public boolean isDynamic() {
return true;
}
Modified: incubator/tuscany/java/sca/modules/extension-helper/src/main/java/org/apache/tuscany/sca/spi/utils/DefaultPropertyValueObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/extension-helper/src/main/java/org/apache/tuscany/sca/spi/utils/DefaultPropertyValueObjectFactory.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/extension-helper/src/main/java/org/apache/tuscany/sca/spi/utils/DefaultPropertyValueObjectFactory.java (original)
+++ incubator/tuscany/java/sca/modules/extension-helper/src/main/java/org/apache/tuscany/sca/spi/utils/DefaultPropertyValueObjectFactory.java Sun Aug 19 22:13:29 2007
@@ -106,7 +106,7 @@
Document doc = (Document)property;
Element element = doc.getDocumentElement();
if (element.getChildNodes().getLength() == 1 &&
- element.getChildNodes().item(0).getNodeType() == Element.TEXT_NODE) {
+ element.getChildNodes().item(0).getNodeType() == Node.TEXT_NODE) {
return true;
}
}
@@ -136,7 +136,7 @@
Element rootElement = document.getDocumentElement();
List<Node> propValues = new ArrayList<Node>();
for (int count = 0 ; count < rootElement.getChildNodes().getLength() ; ++count) {
- if (rootElement.getChildNodes().item(count).getNodeType() == Document.ELEMENT_NODE) {
+ if (rootElement.getChildNodes().item(count).getNodeType() == Node.ELEMENT_NODE) {
propValues.add(rootElement.getChildNodes().item(count));
}
}
Modified: incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomainBean.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomainBean.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomainBean.java (original)
+++ incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomainBean.java Sun Aug 19 22:13:29 2007
@@ -37,6 +37,7 @@
public SCADomainBean() {
}
+ @Override
public String getURI() {
return uri;
}
Modified: incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCATestCaseRunner.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCATestCaseRunner.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCATestCaseRunner.java (original)
+++ incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCATestCaseRunner.java Sun Aug 19 22:13:29 2007
@@ -52,7 +52,7 @@
*/
public SCATestCaseRunner(Class testClass) {
try {
- classLoader = (URLClassLoader)testClass.getClassLoader();
+ classLoader = testClass.getClassLoader();
if (classLoader instanceof URLClassLoader) {
URL[] urls = ((URLClassLoader)classLoader).getURLs();
classLoader = new URLClassLoader(urls, classLoader.getParent());
Modified: incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/HotUpdatableSCADomain.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/HotUpdatableSCADomain.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/HotUpdatableSCADomain.java (original)
+++ incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/HotUpdatableSCADomain.java Sun Aug 19 22:13:29 2007
@@ -32,7 +32,6 @@
import java.util.HashMap;
import java.util.List;
-import org.apache.tuscany.sca.assembly.Component;
import org.apache.tuscany.sca.assembly.Composite;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
import org.apache.tuscany.sca.contribution.resolver.impl.ModelResolverImpl;
@@ -383,6 +382,7 @@
return domainURI;
}
+ @Override
public ComponentManager getComponentManager(){
return scaDomain.getComponentManager();
}
Modified: incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/impl/CRUDImplementationImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/impl/CRUDImplementationImpl.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/impl/CRUDImplementationImpl.java (original)
+++ incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/impl/CRUDImplementationImpl.java Sun Aug 19 22:13:29 2007
@@ -18,7 +18,6 @@
*/
package crud.impl;
-import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -31,10 +30,6 @@
import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract;
import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
-import org.apache.tuscany.sca.policy.Intent;
-import org.apache.tuscany.sca.policy.IntentAttachPointType;
-import org.apache.tuscany.sca.policy.PolicySet;
-
import crud.CRUD;
import crud.CRUDImplementation;
Modified: incubator/tuscany/java/sca/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainBeanTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainBeanTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainBeanTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainBeanTestCase.java Sun Aug 19 22:13:29 2007
@@ -32,6 +32,7 @@
private SCADomainBean domain;
+ @Override
protected void setUp() throws Exception {
domain = new SCADomainBean();
domain.setDeployableComposites("crud.composite");
@@ -55,6 +56,7 @@
/**
* @throws java.lang.Exception
*/
+ @Override
protected void tearDown() throws Exception {
domain.close();
}
Modified: incubator/tuscany/java/sca/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainTestCase.java Sun Aug 19 22:13:29 2007
@@ -32,6 +32,7 @@
private SCADomain domain;
+ @Override
protected void setUp() throws Exception {
domain = SCADomain.newInstance("crud.composite");
}
@@ -54,6 +55,7 @@
/**
* @throws java.lang.Exception
*/
+ @Override
protected void tearDown() throws Exception {
domain.close();
}
Modified: incubator/tuscany/java/sca/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomainTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomainTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomainTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomainTestCase.java Sun Aug 19 22:13:29 2007
@@ -33,6 +33,7 @@
/**
* @throws java.lang.Exception
*/
+ @Override
protected void setUp() throws Exception {
domain = new DefaultSCADomain(getClass().getClassLoader(), getClass().getClassLoader(),
"http://localhost", ".", "crud.composite");
@@ -57,6 +58,7 @@
/**
* @throws java.lang.Exception
*/
+ @Override
protected void tearDown() throws Exception {
domain.close();
}
Modified: incubator/tuscany/java/sca/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomainTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomainTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomainTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomainTestCase.java Sun Aug 19 22:13:29 2007
@@ -43,6 +43,7 @@
/**
* @throws java.lang.Exception
*/
+ @Override
protected void setUp() throws Exception {
// Create a test embedded SCA domain
@@ -189,6 +190,7 @@
/**
* @throws java.lang.Exception
*/
+ @Override
protected void tearDown() throws Exception {
domain.close();
}
Modified: incubator/tuscany/java/sca/modules/http-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/http-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/http-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java (original)
+++ incubator/tuscany/java/sca/modules/http-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java Sun Aug 19 22:13:29 2007
@@ -263,7 +263,7 @@
}
}
if (removedServlet != null) {
- servletHandler.setServletMappings((ServletMapping[])mappings.toArray(new ServletMapping[mappings.size()]));
+ servletHandler.setServletMappings(mappings.toArray(new ServletMapping[mappings.size()]));
}
return removedServlet;
}
Modified: incubator/tuscany/java/sca/modules/http-jetty/src/test/java/org/apache/tuscany/sca/http/jetty/JettyServerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/http-jetty/src/test/java/org/apache/tuscany/sca/http/jetty/JettyServerTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/http-jetty/src/test/java/org/apache/tuscany/sca/http/jetty/JettyServerTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/http-jetty/src/test/java/org/apache/tuscany/sca/http/jetty/JettyServerTestCase.java Sun Aug 19 22:13:29 2007
@@ -227,6 +227,7 @@
boolean invoked;
String sessionId;
+ @Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
invoked = true;
sessionId = req.getSession().getId();
Modified: incubator/tuscany/java/sca/modules/http-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/ServletWrapper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/http-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/ServletWrapper.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/http-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/ServletWrapper.java (original)
+++ incubator/tuscany/java/sca/modules/http-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/ServletWrapper.java Sun Aug 19 22:13:29 2007
@@ -37,10 +37,12 @@
this.servlet = servlet;
}
+ @Override
public synchronized Servlet loadServlet() {
return servlet;
}
+ @Override
public Servlet getServlet() {
return servlet;
}
Modified: incubator/tuscany/java/sca/modules/http-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatServer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/http-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatServer.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/http-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatServer.java (original)
+++ incubator/tuscany/java/sca/modules/http-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatServer.java Sun Aug 19 22:13:29 2007
@@ -278,6 +278,7 @@
}
}
+ @Override
public void start() throws Exception {
if (!initialized)
init();
@@ -291,6 +292,7 @@
}
}
+ @Override
public void stop() {
super.stop();
try {
@@ -300,6 +302,7 @@
}
}
+ @Override
public int getCurrentThreadsBusy() {
return 0;
}
Modified: incubator/tuscany/java/sca/modules/http-tomcat/src/test/java/org/apache/tuscany/sca/http/tomcat/TomcatServerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/http-tomcat/src/test/java/org/apache/tuscany/sca/http/tomcat/TomcatServerTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/http-tomcat/src/test/java/org/apache/tuscany/sca/http/tomcat/TomcatServerTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/http-tomcat/src/test/java/org/apache/tuscany/sca/http/tomcat/TomcatServerTestCase.java Sun Aug 19 22:13:29 2007
@@ -228,6 +228,7 @@
boolean invoked;
String sessionId;
+ @Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
invoked = true;
sessionId = req.getSession().getId();
Modified: incubator/tuscany/java/sca/modules/implementation-das/src/main/java/org/apache/tuscany/sca/implementation/das/DASImplementation.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-das/src/main/java/org/apache/tuscany/sca/implementation/das/DASImplementation.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-das/src/main/java/org/apache/tuscany/sca/implementation/das/DASImplementation.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-das/src/main/java/org/apache/tuscany/sca/implementation/das/DASImplementation.java Sun Aug 19 22:13:29 2007
@@ -18,7 +18,6 @@
*/
package org.apache.tuscany.sca.implementation.das;
-import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -32,9 +31,6 @@
import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract;
import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
-import org.apache.tuscany.sca.policy.Intent;
-import org.apache.tuscany.sca.policy.IntentAttachPointType;
-import org.apache.tuscany.sca.policy.PolicySet;
/**
Modified: incubator/tuscany/java/sca/modules/implementation-das/src/test/java/org/apache/tuscany/sca/implementation/das/DASTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-das/src/test/java/org/apache/tuscany/sca/implementation/das/DASTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-das/src/test/java/org/apache/tuscany/sca/implementation/das/DASTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-das/src/test/java/org/apache/tuscany/sca/implementation/das/DASTestCase.java Sun Aug 19 22:13:29 2007
@@ -38,6 +38,7 @@
/**
* @throws java.lang.Exception
*/
+ @Override
protected void setUp() throws Exception {
scaDomain = SCADomain.newInstance("das.composite");
dasService = scaDomain.getService(DAS.class, "DASServiceComponent");
@@ -47,6 +48,7 @@
/**
* @throws java.lang.Exception
*/
+ @Override
protected void tearDown() throws Exception {
scaDomain.close();
}
Modified: incubator/tuscany/java/sca/modules/implementation-das/src/test/java/org/apache/tuscany/sca/implementation/das/company/CompanyServiceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-das/src/test/java/org/apache/tuscany/sca/implementation/das/company/CompanyServiceTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-das/src/test/java/org/apache/tuscany/sca/implementation/das/company/CompanyServiceTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-das/src/test/java/org/apache/tuscany/sca/implementation/das/company/CompanyServiceTestCase.java Sun Aug 19 22:13:29 2007
@@ -32,6 +32,7 @@
/**
* @throws java.lang.Exception
*/
+ @Override
protected void setUp() throws Exception {
/*
scaDomain = SCADomain.newInstance("company.composite");
@@ -42,6 +43,7 @@
/**
* @throws java.lang.Exception
*/
+ @Override
protected void tearDown() throws Exception {
/*
scaDomain.close();
Modified: incubator/tuscany/java/sca/modules/implementation-data/src/main/java/org/apache/tuscany/sca/implementation/data/DATAImplementation.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-data/src/main/java/org/apache/tuscany/sca/implementation/data/DATAImplementation.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-data/src/main/java/org/apache/tuscany/sca/implementation/data/DATAImplementation.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-data/src/main/java/org/apache/tuscany/sca/implementation/data/DATAImplementation.java Sun Aug 19 22:13:29 2007
@@ -18,7 +18,6 @@
*/
package org.apache.tuscany.sca.implementation.data;
-import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -33,9 +32,6 @@
import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract;
import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
-import org.apache.tuscany.sca.policy.Intent;
-import org.apache.tuscany.sca.policy.IntentAttachPointType;
-import org.apache.tuscany.sca.policy.PolicySet;
/**
Modified: incubator/tuscany/java/sca/modules/implementation-data/src/main/java/org/apache/tuscany/sca/implementation/data/das/DataAccessEngineManager.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-data/src/main/java/org/apache/tuscany/sca/implementation/data/das/DataAccessEngineManager.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-data/src/main/java/org/apache/tuscany/sca/implementation/data/das/DataAccessEngineManager.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-data/src/main/java/org/apache/tuscany/sca/implementation/data/das/DataAccessEngineManager.java Sun Aug 19 22:13:29 2007
@@ -19,9 +19,6 @@
package org.apache.tuscany.sca.implementation.data.das;
-import java.util.HashMap;
-import java.util.Map;
-
import org.apache.tuscany.das.rdb.ConfigHelper;
import org.apache.tuscany.das.rdb.DAS;
import org.apache.tuscany.sca.implementation.data.config.ConnectionInfo;
Modified: incubator/tuscany/java/sca/modules/implementation-data/src/test/java/org/apache/tuscany/sca/implementation/data/DATAImplementationProcessorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-data/src/test/java/org/apache/tuscany/sca/implementation/data/DATAImplementationProcessorTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-data/src/test/java/org/apache/tuscany/sca/implementation/data/DATAImplementationProcessorTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-data/src/test/java/org/apache/tuscany/sca/implementation/data/DATAImplementationProcessorTestCase.java Sun Aug 19 22:13:29 2007
@@ -71,6 +71,7 @@
private XMLInputFactory xmlFactory;
private ModelFactoryExtensionPoint modelFactories;
+ @Override
protected void setUp() throws Exception {
super.setUp();
xmlFactory = XMLInputFactory.newInstance();
Modified: incubator/tuscany/java/sca/modules/implementation-data/src/test/java/org/apache/tuscany/sca/implementation/data/DATATestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-data/src/test/java/org/apache/tuscany/sca/implementation/data/DATATestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-data/src/test/java/org/apache/tuscany/sca/implementation/data/DATATestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-data/src/test/java/org/apache/tuscany/sca/implementation/data/DATATestCase.java Sun Aug 19 22:13:29 2007
@@ -38,6 +38,7 @@
/**
* @throws java.lang.Exception
*/
+ @Override
protected void setUp() throws Exception {
scaDomain = SCADomain.newInstance("data.composite");
dataService = scaDomain.getService(DATA.class, "DataComponent");
@@ -46,6 +47,7 @@
/**
* @throws java.lang.Exception
*/
+ @Override
protected void tearDown() throws Exception {
scaDomain.close();
}
Modified: incubator/tuscany/java/sca/modules/implementation-data/src/test/java/org/apache/tuscany/sca/implementation/data/companyFeed/CompanyFeed.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-data/src/test/java/org/apache/tuscany/sca/implementation/data/companyFeed/CompanyFeed.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-data/src/test/java/org/apache/tuscany/sca/implementation/data/companyFeed/CompanyFeed.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-data/src/test/java/org/apache/tuscany/sca/implementation/data/companyFeed/CompanyFeed.java Sun Aug 19 22:13:29 2007
@@ -19,7 +19,6 @@
package org.apache.tuscany.sca.implementation.data.companyFeed;
-import java.io.InputStream;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java Sun Aug 19 22:13:29 2007
@@ -19,8 +19,6 @@
package org.apache.tuscany.sca.implementation.java.invocation;
-import java.net.URI;
-
import org.apache.tuscany.sca.assembly.Service;
import org.apache.tuscany.sca.context.ComponentContextFactory;
import org.apache.tuscany.sca.context.RequestContextFactory;
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaInstanceFactoryProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaInstanceFactoryProvider.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaInstanceFactoryProvider.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaInstanceFactoryProvider.java Sun Aug 19 22:13:29 2007
@@ -105,7 +105,7 @@
private Injector<T>[] getInjectors() {
// work around JDK1.5 issue with allocating generic arrays
@SuppressWarnings("unchecked")
- Injector<T>[] injectors = (Injector<T>[])new Injector[injectionSites.size()];
+ Injector<T>[] injectors = new Injector[injectionSites.size()];
int i = 0;
for (JavaElementImpl element : injectionSites) {
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/PassByValueInvoker.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/PassByValueInvoker.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/PassByValueInvoker.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/PassByValueInvoker.java Sun Aug 19 22:13:29 2007
@@ -54,6 +54,7 @@
this.operation = operation;
}
+ @Override
public Message invoke(Message msg) {
Object obj = msg.getBody();
msg.setBody(copy((Object[])obj));
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapperTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapperTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapperTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapperTestCase.java Sun Aug 19 22:13:29 2007
@@ -73,6 +73,7 @@
EasyMock.verify(destroyInvoker);
}
+ @Override
@SuppressWarnings("unchecked")
protected void setUp() throws Exception {
super.setUp();
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjectorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjectorTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjectorTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjectorTestCase.java Sun Aug 19 22:13:29 2007
@@ -37,6 +37,7 @@
}
+ @Override
protected void setUp() throws Exception {
super.setUp();
protectedField = Foo.class.getDeclaredField("hidden");
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodEventInvokerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodEventInvokerTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodEventInvokerTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodEventInvokerTestCase.java Sun Aug 19 22:13:29 2007
@@ -52,6 +52,7 @@
}
}
+ @Override
protected void setUp() throws Exception {
super.setUp();
privateMethod = MethodEventInvokerTestCase.Foo.class.getDeclaredMethod("hidden");
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjectorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjectorTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjectorTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjectorTestCase.java Sun Aug 19 22:13:29 2007
@@ -55,6 +55,7 @@
}
}
+ @Override
protected void setUp() throws Exception {
super.setUp();
fooMethod = Foo.class.getMethod("foo", String.class);
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactoryTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactoryTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactoryTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactoryTestCase.java Sun Aug 19 22:13:29 2007
@@ -60,6 +60,7 @@
assertEquals("foo", foo.foo);
}
+ @Override
protected void setUp() throws Exception {
super.setUp();
ctor = Foo.class.getConstructor(String.class);
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean1.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean1.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean1.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean1.java Sun Aug 19 22:13:29 2007
@@ -34,6 +34,7 @@
public void setMethod1(int param) {
}
+ @Override
public void override(String param) throws Exception {
}
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java Sun Aug 19 22:13:29 2007
@@ -62,6 +62,7 @@
private PolicyFactory policyFactory;
private InterfaceContractMapper mapper;
+ @Override
public void setUp() throws Exception {
ModelFactoryExtensionPoint modelFactories = new DefaultModelFactoryExtensionPoint();
assemblyFactory = new DefaultAssemblyFactory();
@@ -84,6 +85,7 @@
staxProcessors.addArtifactProcessor(javaProcessor);
}
+ @Override
public void tearDown() throws Exception {
inputFactory = null;
staxProcessors = null;
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/WriteTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/WriteTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/WriteTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/WriteTestCase.java Sun Aug 19 22:13:29 2007
@@ -58,6 +58,7 @@
private PolicyFactory policyFactory;
private InterfaceContractMapper mapper;
+ @Override
public void setUp() throws Exception {
ModelFactoryExtensionPoint modelFactories = new DefaultModelFactoryExtensionPoint();
factory = new DefaultAssemblyFactory();
@@ -80,6 +81,7 @@
staxProcessors.addArtifactProcessor(javaProcessor);
}
+ @Override
public void tearDown() throws Exception {
inputFactory = null;
staxProcessors = null;
Modified: incubator/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaElementImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaElementImpl.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaElementImpl.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaElementImpl.java Sun Aug 19 22:13:29 2007
@@ -154,6 +154,7 @@
return null;
}
+ @Override
public String toString() {
return anchor.toString() + (elementType == ElementType.PARAMETER ? "[" + index + "]" : "");
}
Modified: incubator/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java Sun Aug 19 22:13:29 2007
@@ -27,8 +27,6 @@
import java.util.Map;
import org.apache.tuscany.sca.implementation.java.JavaImplementation;
-import org.apache.tuscany.sca.policy.Intent;
-import org.apache.tuscany.sca.policy.PolicySet;
/**
* A component type specialization for POJO implementations
Modified: incubator/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaScopeImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaScopeImpl.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaScopeImpl.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaScopeImpl.java Sun Aug 19 22:13:29 2007
@@ -42,6 +42,7 @@
return scope;
}
+ @Override
public boolean equals(Object o) {
if (this == o) {
return true;
@@ -53,10 +54,12 @@
return !(scope != null ? scope != scope1.scope.intern() : scope1.scope != null);
}
+ @Override
public int hashCode() {
return scope != null ? scope.hashCode() : 0;
}
+ @Override
public String toString() {
return scope;
}
Modified: incubator/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessor.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessor.java Sun Aug 19 22:13:29 2007
@@ -46,6 +46,7 @@
this.annotationClass = annotationClass;
}
+ @Override
public void visitMethod(Method method, JavaImplementation type) throws IntrospectionException {
A annotation = method.getAnnotation(annotationClass);
if (annotation == null) {
@@ -83,6 +84,7 @@
properties.put(name, element);
}
+ @Override
public void visitField(Field field, JavaImplementation type) throws IntrospectionException {
A annotation = field.getAnnotation(annotationClass);
@@ -110,6 +112,7 @@
properties.put(name, element);
}
+ @Override
public void visitConstructorParameter(JavaParameterImpl parameter, JavaImplementation type)
throws IntrospectionException {
Modified: incubator/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java Sun Aug 19 22:13:29 2007
@@ -36,6 +36,7 @@
super(factory);
}
+ @Override
public <T> void visitClass(Class<T> clazz, JavaImplementation type) throws IntrospectionException {
type.setAllowsPassByReference(clazz.isAnnotationPresent(AllowsPassByReference.class));
}
Modified: incubator/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ComponentNameProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ComponentNameProcessor.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ComponentNameProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ComponentNameProcessor.java Sun Aug 19 22:13:29 2007
@@ -41,6 +41,7 @@
super(factory);
}
+ @Override
public void visitMethod(Method method, JavaImplementation type) throws IntrospectionException {
if (method.getAnnotation(ComponentName.class) == null) {
return;
@@ -61,6 +62,7 @@
}
}
+ @Override
public void visitField(Field field, JavaImplementation type) throws IntrospectionException {
if (field.getAnnotation(ComponentName.class) == null) {
return;
Modified: incubator/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java Sun Aug 19 22:13:29 2007
@@ -39,6 +39,7 @@
super(factory);
}
+ @Override
public <T> void visitClass(Class<T> clazz, JavaImplementation type) throws IntrospectionException {
Constructor[] ctors = clazz.getConstructors();
boolean found = false;
@@ -55,6 +56,7 @@
}
}
+ @Override
public <T> void visitConstructor(Constructor<T> constructor, JavaImplementation type)
throws IntrospectionException {
org.osoa.sca.annotations.Constructor annotation = constructor
Modified: incubator/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java Sun Aug 19 22:13:29 2007
@@ -43,6 +43,7 @@
super(factory);
}
+ @Override
public void visitMethod(Method method, JavaImplementation type) throws IntrospectionException {
if (method.getAnnotation(Context.class) == null) {
return;
@@ -63,6 +64,7 @@
}
}
+ @Override
public void visitField(Field field, JavaImplementation type) throws IntrospectionException {
if (field.getAnnotation(Context.class) == null) {
return;
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org