You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jm...@apache.org on 2006/06/10 07:34:22 UTC
svn commit: r413250 [1/2] - in /incubator/tuscany/sandbox/jboynes/sca: ./
buildtools/ buildtools/src/ buildtools/src/main/
buildtools/src/main/resources/ spi/ spi/src/main/java/org/apache/tuscany/spi/
spi/src/main/java/org/apache/tuscany/spi/annotation...
Author: jmarino
Date: Fri Jun 9 22:34:19 2006
New Revision: 413250
URL: http://svn.apache.org/viewvc?rev=413250&view=rev
Log:
begin cutover to checkstyle; start with SPI; still need to put tuscany-checkstyle.xml in the proper place but keep it here for now
Added:
incubator/tuscany/sandbox/jboynes/sca/buildtools/
incubator/tuscany/sandbox/jboynes/sca/buildtools/pom.xml (with props)
incubator/tuscany/sandbox/jboynes/sca/buildtools/src/
incubator/tuscany/sandbox/jboynes/sca/buildtools/src/main/
incubator/tuscany/sandbox/jboynes/sca/buildtools/src/main/resources/
incubator/tuscany/sandbox/jboynes/sca/buildtools/src/main/resources/tuscany-checkstyle.xml (with props)
incubator/tuscany/sandbox/jboynes/sca/spi/.checkstyle
incubator/tuscany/sandbox/jboynes/sca/spi/.pmd
incubator/tuscany/sandbox/jboynes/sca/spi/.ruleset
incubator/tuscany/sandbox/jboynes/sca/spi/tuscany-checkstyle.xml (with props)
Modified:
incubator/tuscany/sandbox/jboynes/sca/pom.xml
incubator/tuscany/sandbox/jboynes/sca/spi/pom.xml
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/AbstractLifecycle.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/QualifiedName.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/annotation/Autowire.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/annotation/Constructor.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/annotation/Monitor.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/bootstrap/ComponentNames.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/builder/BindingBuilder.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/builder/Builder.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/builder/BuilderException.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/builder/ComponentBuilder.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/AbstractSCAObject.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/ComponentRuntimeException.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/Reference.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/Service.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/WorkContext.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/deployer/Deployer.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/event/Event.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/event/EventFilter.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/event/EventPublisher.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/event/RuntimeEventListener.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/AtomicComponentExtension.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/BindingBuilderExtension.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/ReferenceExtension.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/ServiceExtension.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/Loader.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/StAXPropertyFactory.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/ComponentType.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/CompositeComponentType.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/monitor/LogLevel.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/policy/PolicyBuilderRegistry.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/policy/SourcePolicyBuilder.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/policy/TargetPolicyBuilder.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/InvocationChain.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/Message.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/TargetInvoker.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/WireInvocationHandler.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/test/java/org/apache/tuscany/spi/QualifiedNameTestCase.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/test/java/org/apache/tuscany/spi/TuscanyExceptionTestCase.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/test/java/org/apache/tuscany/spi/TuscanyRuntimeExceptionTestCase.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/test/java/org/apache/tuscany/spi/annotation/ConstructorAnnotationTest.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/test/java/org/apache/tuscany/spi/component/AbstractSCAObjectTestCase.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/test/java/org/apache/tuscany/spi/extension/LoaderExtensionTestCase.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/test/java/org/apache/tuscany/spi/loader/LoaderExceptionTestCase.java
Added: incubator/tuscany/sandbox/jboynes/sca/buildtools/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/buildtools/pom.xml?rev=413250&view=auto
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/buildtools/pom.xml (added)
+++ incubator/tuscany/sandbox/jboynes/sca/buildtools/pom.xml Fri Jun 9 22:34:19 2006
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Copyright (c) 2005-2006 The Apache Software Foundation or its licensors, as applicable.
+ *
+ * Licensed 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.
+ -->
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.tuscany</groupId>
+ <artifactId>tuscany-buildtools</artifactId>
+ <packaging>jar</packaging>
+ <name>Tuscany Build Tools</name>
+ <version>SNAPSHOT</version>
+</project>
Propchange: incubator/tuscany/sandbox/jboynes/sca/buildtools/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/sandbox/jboynes/sca/buildtools/pom.xml
------------------------------------------------------------------------------
svn:keywords = Rev,Date
Added: incubator/tuscany/sandbox/jboynes/sca/buildtools/src/main/resources/tuscany-checkstyle.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/buildtools/src/main/resources/tuscany-checkstyle.xml?rev=413250&view=auto
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/buildtools/src/main/resources/tuscany-checkstyle.xml (added)
+++ incubator/tuscany/sandbox/jboynes/sca/buildtools/src/main/resources/tuscany-checkstyle.xml Fri Jun 9 22:34:19 2006
@@ -0,0 +1,285 @@
+<?xml version="1.0"?>
+<!--
+ Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
+
+ Licensed 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.
+ -->
+<!DOCTYPE module PUBLIC
+ "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
+ "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
+
+<!--
+Checks to make sure the code meets the Tuscany coding guidelines
+http://java.sun.com/docs/codeconv/index.html
+
+It also enforces aa bunch of other "BestPractices like method
+lengths, if/try depths, etc...
+
+-->
+
+<module name="Checker">
+ <property name="severity"
+ value="${checkstyle.severity}"
+ default="warning"/>
+
+ <!-- Checks whether files end with a new line. -->
+ <!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
+ <!--
+ <module name="NewlineAtEndOfFile"/>
+ -->
+
+ <!-- Checks that property files contain the same keys. -->
+ <!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
+ <module name="Translation"/>
+
+ <!--<module name="StrictDuplicateCode"/>-->
+
+ <module name="TreeWalker">
+
+ <!-- Checks for Javadoc comments. -->
+ <!-- See http://checkstyle.sf.net/config_javadoc.html -->
+ <!--
+ <module name="PackageHtml"/>
+ <module name="JavadocMethod"/>
+ <module name="JavadocType"/>
+ <module name="JavadocVariable"/>
+ <module name="JavadocStyle"/>
+ -->
+
+
+ <!-- Checks for Naming Conventions. -->
+ <!-- See http://checkstyle.sf.net/config_naming.html -->
+ <module name="AbstractClassName">
+ <property name="format"
+ value="^Abstract.*$|^.*Factory$|^.*Bus$|^.*ConfigurationRepository$|^.*Base$|^Exception$|^.*Builder$"/>
+ </module>
+ <module name="ConstantName"/>
+ <module name="LocalFinalVariableName"/>
+ <module name="LocalVariableName"/>
+ <module name="MemberName"/>
+ <module name="MethodName"/>
+ <module name="PackageName"/>
+ <module name="ParameterName"/>
+ <module name="StaticVariableName"/>
+ <module name="TypeName"/>
+
+ <!-- Header checks -->
+ <!-- <module name="Header"/> -->
+ <!-- <module name="RegexpHeader"/> -->
+
+
+ <!-- Checks for imports -->
+ <!-- See http://checkstyle.sf.net/config_import.html -->
+ <module name="AvoidStarImport">
+ <property name="excludes"
+ value="java.io,java.util,java.net,java.nio,java.nio.channels,java.lang.reflect,org.w3c.dom,org.xml.sax,java.awt,javax.swing,junit.framework"/>
+ </module>
+ <module name="IllegalImport"/>
+ <!-- defaults to sun.* packages -->
+ <module name="RedundantImport"/>
+ <module name="UnusedImports"/>
+ <module name="ImportOrder">
+ <property name="groups" value="java,javax,org.w3c,org.xml,w3c"/>
+ <property name="ordered" value="true"/>
+ </module>
+ <!--
+ <module name="ImportControl">
+ <property name="file" value="etc/import-control.xml"/>
+ </module>
+ -->
+
+
+ <!-- Checks for Size Violations. -->
+ <!-- See http://checkstyle.sf.net/config_sizes.html -->
+ <module name="AnonInnerLength">
+ <property name="max" value="40"/>
+ </module>
+ <module name="ExecutableStatementCount">
+ <property name="max" value="50"/>
+ </module>
+ <module name="FileLength"/>
+ <module name="LineLength">
+ <property name="max" value="115"/>
+ </module>
+ <module name="MethodLength">
+ <property name="max" value="150"/>
+ <property name="countEmpty" value="false"/>
+ </module>
+ <module name="ParameterNumber">
+ <property name="max" value="7"/>
+ </module>
+
+ <!-- Checks for whitespace -->
+ <!-- See http://checkstyle.sf.net/config_whitespace.html -->
+ <module name="EmptyForIteratorPad"/>
+ <module name="EmptyForInitializerPad"/>
+ <module name="MethodParamPad"/>
+ <module name="NoWhitespaceAfter">
+ <property name="tokens" value="ARRAY_INIT,BNOT,DEC,DOT,INC,LNOT,UNARY_MINUS,UNARY_PLUS"/>
+ </module>
+ <module name="NoWhitespaceBefore"/>
+ <module name="OperatorWrap"/>
+ <module name="ParenPad"/>
+ <module name="TypecastParenPad"/>
+ <module name="TabCharacter"/>
+ <module name="WhitespaceAfter">
+ <property name="tokens" value="COMMA, SEMI"/>
+ </module>
+ <module name="WhitespaceAround">
+ <property name="tokens"
+ value="ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, EQUAL, GE, GT, LAND, LCURLY, LE, LITERAL_ASSERT, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, RCURLY, SL, SLIST, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN,TYPE_EXTENSION_AND"/>
+ </module>
+
+
+ <!-- Modifier Checks -->
+ <!-- See http://checkstyle.sf.net/config_modifiers.html -->
+ <module name="ModifierOrder"/>
+ <module name="RedundantModifier"/>
+
+
+ <!-- Checks for blocks. You know, those {}'s -->
+ <!-- See http://checkstyle.sf.net/config_blocks.html -->
+ <module name="AvoidNestedBlocks">
+ <property name="allowInSwitchCase" value="true"/>
+ </module>
+ <module name="EmptyBlock">
+ <property name="option" value="text"/>
+ </module>
+ <module name="LeftCurly"/>
+ <module name="NeedBraces"/>
+ <module name="RightCurly"/>
+
+
+ <!-- Checks for common coding problems -->
+ <!-- See http://checkstyle.sf.net/config_coding.html -->
+ <!--<module name="ArrayTrailingComma"/>-->
+ <!--<module name="AvoidInlineConditionals"/>-->
+ <module name="CovariantEquals"/>
+ <module name="DoubleCheckedLocking"/>
+ <module name="EmptyStatement"/>
+ <module name="EqualsHashCode"/>
+ <!--<module name="FinalLocalVariable"/>-->
+ <module name="HiddenField">
+ <property name="ignoreConstructorParameter" value="true"/>
+ <property name="ignoreSetter" value="true"/>
+ <property name="ignoreAbstractMethods" value="true"/>
+ </module>
+ <module name="IllegalInstantiation"/>
+ <!--<module name="IllegalToken"/>-->
+ <!--<module name="IllegalTokenText"/>-->
+ <!--<module name="InnerAssignment"/>-->
+ <!--<module name="MagicNumber"/>-->
+ <module name="MissingSwitchDefault"/>
+ <module name="ModifiedControlVariable"/>
+ <module name="SimplifyBooleanExpression"/>
+ <module name="SimplifyBooleanReturn"/>
+ <module name="StringLiteralEquality"/>
+ <module name="NestedIfDepth">
+ <property name="max" value="3"/>
+ </module>
+ <module name="NestedTryDepth">
+ <property name="max" value="3"/>
+ </module>
+ <module name="SuperClone"/>
+ <module name="SuperFinalize"/>
+ <!--<module name="IllegalCatch"/>-->
+ <module name="IllegalThrows">
+ <property name="illegalClassNames" value="java.lang.Error,java.lang.RuntimeException"/>
+ </module>
+ <!--<module name="RedundantThrows"/>-->
+ <module name="PackageDeclaration"/>
+ <module name="JUnitTestCase"/>
+ <module name="ReturnCount">
+ <property name="max" value="6"/>
+ </module>
+
+ <module name="IllegalType">
+ <property name="format" value="^xxx$"/>
+ </module>
+ <module name="DeclarationOrder"/>
+ <!--<module name="ParameterAssignment"/>-->
+ <module name="ExplicitInitialization"/>
+ <module name="DefaultComesLast"/>
+ <!--<module name="MissingCtor"/>-->
+ <module name="FallThrough"/>
+ <!--<module name="MultipleStringLiterals"/>-->
+ <module name="MultipleVariableDeclarations"/>
+ <!--<module name="RequireThis"/>-->
+ <module name="UnnecessaryParentheses"/>
+
+
+ <!-- Checks for class design -->
+ <!-- See http://checkstyle.sf.net/config_design.html -->
+ <!--<module name="DesignForExtension"/>-->
+ <module name="FinalClass"/>
+ <module name="HideUtilityClassConstructor"/>
+ <module name="InterfaceIsType"/>
+ <module name="MutableException"/>
+ <module name="ThrowsCount">
+ <property name="max" value="5"/>
+ </module>
+ <module name="VisibilityModifier">
+ <property name="protectedAllowed" value="true"/>
+ <property name="packageAllowed" value="true"/>
+ </module>
+
+
+ <!-- Metrics checks. -->
+ <!-- See http://checkstyle.sf.net/config_metrics.html -->
+ <module name="BooleanExpressionComplexity">
+ <property name="max" value="6"/>
+ </module>
+ <!--<module name="ClassDataAbstractionCoupling"/>-->
+ <!--<module name="ClassFanOutComplexity"/>-->
+ <!--<module name="CyclomaticComplexity"/>-->
+ <!--<module name="NPathComplexity"/>-->
+ <module name="JavaNCSS">
+ <property name="methodMaximum" value="75"/>
+ </module>
+
+
+ <!-- Miscellaneous other checks. -->
+ <!-- See http://checkstyle.sf.net/config_misc.html -->
+ <!--
+ <module name="ArrayTypeStyle"/>
+ <module name="FinalParameters"/>
+ -->
+ <!--
+ <module name="GenericIllegalRegexp">
+ <property name="format" value="\s+$"/>
+ <property name="message" value="Line has trailing spaces."/>
+ </module>
+ -->
+ <module name="TodoComment">
+ <property name="format" value="WARNING"/>
+ </module>
+
+ <module name="UpperEll"/>
+
+ <!--Assert statement may have side effects:-->
+ <module name="DescendantToken">
+ <property name="tokens" value="LITERAL_ASSERT"/>
+ <property name="limitedTokens"
+ value="ASSIGN,DEC,INC,POST_DEC,POST_INC,PLUS_ASSIGN,MINUS_ASSIGN,STAR_ASSIGN,DIV_ASSIGN,MOD_ASSIGN,BSR_ASSIGN,SR_ASSIGN,SL_ASSIGN,BAND_ASSIGN,BXOR_ASSIGN,BOR_ASSIGN"/>
+ <property name="maximumNumber" value="0"/>
+ </module>
+
+ <!--<module name="UncommentedMain"/>-->
+ <module name="TrailingComment"/>
+ <module name="Indentation">
+ <property name="caseIndent" value="0"/>
+ </module>
+ <!--<module name="RequiredRegexp">-->
+ </module>
+
+</module>
Propchange: incubator/tuscany/sandbox/jboynes/sca/buildtools/src/main/resources/tuscany-checkstyle.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/sandbox/jboynes/sca/buildtools/src/main/resources/tuscany-checkstyle.xml
------------------------------------------------------------------------------
svn:keywords = Rev,Date
Modified: incubator/tuscany/sandbox/jboynes/sca/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/pom.xml?rev=413250&r1=413249&r2=413250&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/pom.xml (original)
+++ incubator/tuscany/sandbox/jboynes/sca/pom.xml Fri Jun 9 22:34:19 2006
@@ -27,6 +27,7 @@
<version>SNAPSHOT</version>
<modules>
+ <module>buildtools</module>
<module>spi</module>
<module>core2</module>
<module>test</module>
@@ -35,7 +36,7 @@
<module>commands/launcher</module>
<module>runtime/standalone</module>
<module>runtime/equinox</module>
- <!--
+ <!--
<module>databinding</module>
<module>bindings</module>
<module>containers</module>
@@ -76,5 +77,43 @@
</includes>
</testResource>
</testResources>
+
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany</groupId>
+ <artifactId>tuscany-buildtools</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>process-sources</id>
+ <phase>process-sources</phase>
+ <configuration>
+ <configLocation>tuscany-checkstyle.xml</configLocation>
+ <consoleOutput>true</consoleOutput>
+ <failsOnError>true</failsOnError>
+ <linkXRef>false</linkXRef>
+ <sourceDirectory>${basedir}/src</sourceDirectory>
+ <propertyExpansion>
+ ${checkstyle.properties}
+ </propertyExpansion>
+ </configuration>
+ <goals>
+ <goal>checkstyle</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
+
+
</build>
</project>
Added: incubator/tuscany/sandbox/jboynes/sca/spi/.checkstyle
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/.checkstyle?rev=413250&view=auto
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/.checkstyle (added)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/.checkstyle Fri Jun 9 22:34:19 2006
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<fileset-config file-format-version="1.2.0" simple-config="true">
+ <fileset name="all" enabled="true" check-config-name="Tuscany Checks" local="false">
+ <file-match-pattern match-pattern="." include-pattern="true"/>
+ </fileset>
+</fileset-config>
Added: incubator/tuscany/sandbox/jboynes/sca/spi/.pmd
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/.pmd?rev=413250&view=auto
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/.pmd (added)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/.pmd Fri Jun 9 22:34:19 2006
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<pmd><useProjectRuleSet>true</useProjectRuleSet><rules/></pmd>
\ No newline at end of file
Added: incubator/tuscany/sandbox/jboynes/sca/spi/.ruleset
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/.ruleset?rev=413250&view=auto
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/.ruleset (added)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/.ruleset Fri Jun 9 22:34:19 2006
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ruleset name="pmd-eclipse">
+ <description>PMD Plugin preferences rule set</description>
+
+
+ <rule ref="rulesets/basic.xml/BooleanInstantiation"/>
+ <rule ref="rulesets/basic.xml/CollapsibleIfStatements"/>
+ <rule ref="rulesets/basic.xml/DoubleCheckedLocking"/>
+<!--<rule ref="rulesets/basic.xml/EmptyCatchBlock"/>-->
+<!--<rule ref="rulesets/basic.xml/EmptyFinallyBlock"/>-->
+<!--<rule ref="rulesets/basic.xml/EmptyIfStmt"/>-->
+ <rule ref="rulesets/basic.xml/EmptyStatementNotInLoop"/>
+<!--<rule ref="rulesets/basic.xml/EmptyStaticInitializer"/>-->
+<!--<rule ref="rulesets/basic.xml/EmptySwitchStatements"/>-->
+<!--<rule ref="rulesets/basic.xml/EmptySynchronizedBlock"/>-->
+<!--<rule ref="rulesets/basic.xml/EmptyTryBlock"/>-->
+<!--<rule ref="rulesets/basic.xml/EmptyWhileStmt"/>-->
+ <rule ref="rulesets/basic.xml/ForLoopShouldBeWhileLoop"/>
+ <rule ref="rulesets/basic.xml/JumbledIncrementer"/>
+<!--<rule ref="rulesets/basic.xml/OverrideBothEqualsAndHashcode"/>-->
+ <rule ref="rulesets/basic.xml/ReturnFromFinallyBlock"/>
+ <rule ref="rulesets/basic.xml/UnconditionalIfStatement"/>
+ <rule ref="rulesets/basic.xml/UnnecessaryConversionTemporary"/>
+ <rule ref="rulesets/basic.xml/UnnecessaryFinalModifier"/>
+ <rule ref="rulesets/basic.xml/UnnecessaryReturn"/>
+<!--<rule ref="rulesets/basic.xml/UselessOverridingMethod"/>-->
+
+<!--<rule ref="rulesets/braces.xml/ForLoopsMustUseBraces"/>-->
+<!--<rule ref="rulesets/braces.xml/IfElseStmtsMustUseBraces"/>-->
+<!--<rule ref="rulesets/braces.xml/IfStmtsMustUseBraces"/>-->
+<!--<rule ref="rulesets/braces.xml/WhileLoopsMustUseBraces"/>-->
+
+<!--<rule ref="rulesets/clone.xml/CloneMethodMustImplementCloneable"/>-->
+<!--<rule ref="rulesets/clone.xml/CloneThrowsCloneNotSupportedException"/>-->
+<!--<rule ref="rulesets/clone.xml/ProperCloneImplementation"/>-->
+
+<!--<rule ref="rulesets/codesize.xml/CyclomaticComplexity"/>-->
+<!--<rule ref="rulesets/codesize.xml/ExcessiveClassLength"/>-->
+<!--<rule ref="rulesets/codesize.xml/ExcessiveMethodLength"/>-->
+<!--<rule ref="rulesets/codesize.xml/ExcessiveParameterList"/>-->
+<!--<rule ref="rulesets/codesize.xml/ExcessivePublicCount"/>-->
+<!--<rule ref="rulesets/codesize.xml/TooManyFields"/>-->
+
+<rule ref="rulesets/controversial.xml/AssignmentInOperand"/>
+<!--<rule ref="rulesets/controversial.xml/AtLeastOneConstructor"/>-->
+<!--<rule ref="rulesets/controversial.xml/CallSuperInConstructor"/>-->
+<!--<rule ref="rulesets/controversial.xml/DontImportSun"/>-->
+<!--<rule ref="rulesets/controversial.xml/NullAssignment"/>-->
+<!--<rule ref="rulesets/controversial.xml/OnlyOneReturn"/>-->
+<!--<rule ref="rulesets/controversial.xml/SingularField"/>-->
+<!--<rule ref="rulesets/controversial.xml/SuspiciousOctalEscape"/>-->
+<!--<rule ref="rulesets/controversial.xml/UnnecessaryConstructor"/>-->
+<rule ref="rulesets/controversial.xml/UnnecessaryParentheses"/>
+<!--<rule ref="rulesets/controversial.xml/UnusedModifier"/>-->
+
+<!--<rule ref="rulesets/coupling.xml/CouplingBetweenObjects"/>-->
+<!--<rule ref="rulesets/coupling.xml/ExcessiveImports"/>-->
+<!--<rule ref="rulesets/coupling.xml/LooseCoupling"/>-->
+
+<!--<rule ref="rulesets/design.xml/AbstractClassWithoutAbstractMethod"/>-->
+<!--<rule ref="rulesets/design.xml/AccessorClassGeneration"/>-->
+<!--<rule ref="rulesets/design.xml/AssignmentToNonFinalStatic"/>-->
+<!--<rule ref="rulesets/design.xml/AvoidDeeplyNestedIfStmts"/>-->
+<!--<rule ref="rulesets/design.xml/AvoidInstanceofChecksInCatchClause"/>-->
+<rule ref="rulesets/design.xml/AvoidProtectedFieldInFinalClass"/>
+<!--<rule ref="rulesets/design.xml/AvoidReassigningParameters"/>-->
+<!--<rule ref="rulesets/design.xml/AvoidSynchronizedAtMethodLevel"/>-->
+<!--<rule ref="rulesets/design.xml/BadComparison"/>-->
+<!--<rule ref="rulesets/design.xml/CloseConnection"/>-->
+<!--<rule ref="rulesets/design.xml/CompareObjectsWithEquals"/>-->
+<!--<rule ref="rulesets/design.xml/ConfusingTernary"/>-->
+<rule ref="rulesets/design.xml/ConstructorCallsOverridableMethod"/>
+<!--<rule ref="rulesets/design.xml/DefaultLabelNotLastInSwitchStmt"/>-->
+<!--<rule ref="rulesets/design.xml/FinalFieldCouldBeStatic"/>-->
+<rule ref="rulesets/design.xml/IdempotentOperations"/>
+<!--<rule ref="rulesets/design.xml/ImmutableField"/>-->
+<!--<rule ref="rulesets/design.xml/InstantiationToGetClass"/>-->
+<!--<rule ref="rulesets/design.xml/MissingBreakInSwitch"/>-->
+<!--<rule ref="rulesets/design.xml/MissingStaticMethodInNonInstantiatableClass"/>-->
+<!--<rule ref="rulesets/design.xml/NonCaseLabelInSwitchStatement"/>-->
+<!--<rule ref="rulesets/design.xml/NonStaticInitializer"/>-->
+<rule ref="rulesets/design.xml/OptimizableToArrayCall"/>
+<rule ref="rulesets/design.xml/PositionLiteralsFirstInComparisons"/>
+<rule ref="rulesets/design.xml/SimplifyBooleanExpressions"/>
+<rule ref="rulesets/design.xml/SimplifyBooleanReturns"/>
+<rule ref="rulesets/design.xml/SimplifyConditional"/>
+<!--<rule ref="rulesets/design.xml/SwitchDensity"/>-->
+<!--<rule ref="rulesets/design.xml/SwitchStmtsShouldHaveDefault"/>-->
+<rule ref="rulesets/design.xml/UnnecessaryLocalBeforeReturn"/>
+<!--<rule ref="rulesets/design.xml/UseLocaleWithCaseConversions"/>-->
+<!--<rule ref="rulesets/design.xml/UseNotifyAllInsteadOfNotify"/>-->
+<!--<rule ref="rulesets/design.xml/UseSingleton"/>-->
+
+<!--<rule ref="rulesets/finalizers.xml/EmptyFinalizer"/>-->
+<!--<rule ref="rulesets/finalizers.xml/FinalizeOnlyCallsSuperFinalize"/>-->
+<!--<rule ref="rulesets/finalizers.xml/FinalizeOverloaded"/>-->
+<!--<rule ref="rulesets/finalizers.xml/FinalizeDoesNotCallSuperFinalize"/>-->
+<!--<rule ref="rulesets/finalizers.xml/FinalizeShouldBeProtected"/>-->
+<!--<rule ref="rulesets/finalizers.xml/AvoidCallingFinalize"/>-->
+
+<!--<rule ref="rulesets/imports.xml/DuplicateImports"/>-->
+<!--<rule ref="rulesets/imports.xml/DontImportJavaLang"/>-->
+<!--<rule ref="rulesets/imports.xml/UnusedImports"/>-->
+<!--<rule ref="rulesets/imports.xml/ImportFromSamePackage"/>-->
+
+<!--<rule ref="rulesets/javabeans.xml/BeanMembersShouldSerialize"/>-->
+<!--<rule ref="rulesets/javabeans.xml/MissingSerialVersionUID"/>-->
+
+<!--<rule ref="rulesets/junit.xml/JUnitStaticSuite"/>-->
+<!--<rule ref="rulesets/junit.xml/JUnitSpelling"/>-->
+<!--<rule ref="rulesets/junit.xml/JUnitAssertionsShouldIncludeMessage"/>-->
+<!--<rule ref="rulesets/junit.xml/JUnitTestsShouldIncludeAssert"/>-->
+<!--<rule ref="rulesets/junit.xml/TestClassWithoutTestCases"/>-->
+<!--<rule ref="rulesets/junit.xml/UnnecessaryBooleanAssertion"/>-->
+<!--<rule ref="rulesets/junit.xml/UseAssertEqualsInsteadOfAssertTrue"/>-->
+<!--<rule ref="rulesets/junit.xml/UseAssertSameInsteadOfAssertTrue"/>-->
+
+ <!--<rule ref="rulesets/logging-java.xml/AvoidPrintStackTrace"/>-->
+ <rule ref="rulesets/logging-java.xml/LoggerIsNotStaticFinal"/>
+ <!--<rule ref="rulesets/logging-java.xml/MoreThanOneLogger"/>-->
+ <!--<rule ref="rulesets/logging-java.xml/LoggerIsNotStaticFinal"/>-->
+ <!--<rule ref="rulesets/logging-java.xml/LogBlockWithoutIf"/>-->
+ <!--<rule ref="rulesets/logging-java.xml/SystemPrintln"/>-->
+ <!--<rule ref="rulesets/logging-jakarta-commons.xml/UseCorrectExceptionLogging"/>-->
+ <!--<rule ref="rulesets/logging-jakarta-commons.xml/ProperLogger"/>-->
+
+ <!--<rule ref="rulesets/naming.xml/ShortVariable"/>-->
+ <!--<rule ref="rulesets/naming.xml/LongVariable"/>-->
+ <!--<rule ref="rulesets/naming.xml/ShortMethodName"/>-->
+ <!--<rule ref="rulesets/naming.xml/VariableNamingConventions"/>-->
+ <!--<rule ref="rulesets/naming.xml/MethodNamingConventions"/>-->
+ <!--<rule ref="rulesets/naming.xml/ClassNamingConventions"/>-->
+ <!--<rule ref="rulesets/naming.xml/AbstractNaming"/>-->
+ <!--<rule ref="rulesets/naming.xml/AvoidDollarSigns"/>-->
+ <!--<rule ref="rulesets/naming.xml/MethodWithSameNameAsEnclosingClass"/>-->
+ <!--<rule ref="rulesets/naming.xml/SuspiciousHashcodeMethodName"/>-->
+ <!--<rule ref="rulesets/naming.xml/SuspiciousConstantFieldName"/>-->
+ <!--<rule ref="rulesets/naming.xml/AvoidFieldNameMatchingTypeName"/>-->
+ <!--<rule ref="rulesets/naming.xml/AvoidFieldNameMatchingMethodName"/>-->
+ <!--<rule ref="rulesets/naming.xml/AvoidNonConstructorMethodsWithClassName"/>-->
+ <!--<rule ref="rulesets/naming.xml/NoPackage"/>-->
+ <!--<rule ref="rulesets/naming.xml/PackageCase"/>-->
+
+ <!--<rule ref="rulesets/optimizations.xml/LocalVariableCouldBeFinal"/>-->
+ <!--<rule ref="rulesets/optimizations.xml/MethodArgumentCouldBeFinal"/>-->
+ <!--<rule ref="rulesets/optimizations.xml/AvoidInstantiatingObjectsInLoops"/>-->
+ <!--<rule ref="rulesets/optimizations.xml/UseArrayListInsteadOfVector"/>-->
+ <!--<rule ref="rulesets/optimizations.xml/SimplifyStartsWith"/>-->
+ <!--<rule ref="rulesets/optimizations.xml/UseStringBufferForStringAppends"/>-->
+
+ <!--<rule ref="rulesets/strictexception.xml/AvoidCatchingThrowable"/>-->
+ <!--<rule ref="rulesets/strictexception.xml/SignatureDeclareThrowsException"/>-->
+ <!--<rule ref="rulesets/strictexception.xml/ExceptionAsFlowControl"/>-->
+ <!--<rule ref="rulesets/strictexception.xml/AvoidCatchingNPE"/>-->
+ <!--<rule ref="rulesets/strictexception.xml/AvoidThrowingRawExceptionTypes"/>-->
+ <!--<rule ref="rulesets/strictexception.xml/AvoidThrowingNullPointerException"/>-->
+
+ <!--<rule ref="rulesets/strings.xml/AvoidDuplicateLiterals"/>-->
+ <!--<rule ref="rulesets/strings.xml/StringInstantiation"/>-->
+ <!--<rule ref="rulesets/strings.xml/StringToString"/>-->
+ <!--<rule ref="rulesets/strings.xml/AvoidConcatenatingNonLiteralsInStringBuffer"/>-->
+ <!--<rule ref="rulesets/strings.xml/UnnecessaryCaseChange"/>-->
+
+ <!--<rule ref="rulesets/sunsecure.xml/MethodReturnsInternalArray"/>-->
+ <!--<rule ref="rulesets/sunsecure.xml/ArrayIsStoredDirectly"/>-->
+
+ <rule ref="rulesets/unusedcode.xml/UnusedLocalVariable"/>
+ <rule ref="rulesets/unusedcode.xml/UnusedPrivateField"/>
+ <rule ref="rulesets/unusedcode.xml/UnusedPrivateMethod"/>
+ <!--<rule ref="rulesets/unusedcode.xml/UnusedFormalParameter"/>-->
+
+</ruleset>
Modified: incubator/tuscany/sandbox/jboynes/sca/spi/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/pom.xml?rev=413250&r1=413249&r2=413250&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/pom.xml (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/pom.xml Fri Jun 9 22:34:19 2006
@@ -25,7 +25,6 @@
<name>Tuscany SPI</name>
<description>Tuscany Service Provider Interfaces.</description>
<version>SNAPSHOT</version>
-
<dependencies>
<dependency>
<groupId>org.osoa</groupId>
@@ -68,4 +67,39 @@
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ </plugin>
+
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <configuration>
+ <rulesets>
+ <ruleset>${basedir}/.ruleset</ruleset>
+ </rulesets>
+ <linkXRef>false</linkXRef>
+
+ <targetJdk>1.5</targetJdk>
+ </configuration>
+ <executions>
+ <execution>
+ <id>process-sources</id>
+ <phase>process-sources</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ </plugins>
+ </build>
+
+
</project>
Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/AbstractLifecycle.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/AbstractLifecycle.java?rev=413250&r1=413249&r2=413250&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/AbstractLifecycle.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/AbstractLifecycle.java Fri Jun 9 22:34:19 2006
@@ -49,21 +49,21 @@
*/
public String toString() {
switch (lifecycleState) {
- case (Lifecycle.CONFIG_ERROR):
+ case Lifecycle.CONFIG_ERROR:
return "CONFIG_ERROR";
- case (Lifecycle.ERROR):
+ case Lifecycle.ERROR:
return "ERROR";
- case (Lifecycle.INITIALIZING):
+ case Lifecycle.INITIALIZING:
return "INITIALIZING";
- case (Lifecycle.INITIALIZED):
+ case Lifecycle.INITIALIZED:
return "INITIALIZED";
- case (Lifecycle.RUNNING):
+ case Lifecycle.RUNNING:
return "RUNNING";
- case (Lifecycle.STOPPING):
+ case Lifecycle.STOPPING:
return "STOPPING";
- case (Lifecycle.STOPPED):
+ case Lifecycle.STOPPED:
return "STOPPED";
- case (Lifecycle.UNINITIALIZED):
+ case Lifecycle.UNINITIALIZED:
return "UNINITIALIZED";
default:
return "UNKNOWN";
Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/QualifiedName.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/QualifiedName.java?rev=413250&r1=413249&r2=413250&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/QualifiedName.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/QualifiedName.java Fri Jun 9 22:34:19 2006
@@ -23,14 +23,11 @@
* @version $Rev$ $Date$
*/
public class QualifiedName {
+ public static final String NAME_SEPARATOR = "/";
private String qName;
-
private String partName;
-
private String portName;
-
- public static final String NAME_SEPARATOR = "/";
/**
* Constructs a new qualified name in the form of part/port where part is the parent context and port
Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/annotation/Autowire.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/annotation/Autowire.java?rev=413250&r1=413249&r2=413250&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/annotation/Autowire.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/annotation/Autowire.java Fri Jun 9 22:34:19 2006
@@ -13,12 +13,10 @@
*/
package org.apache.tuscany.spi.annotation;
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
+import static java.lang.annotation.ElementType.*;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
/**
* A system annotation to inject an autowired instance
Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/annotation/Constructor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/annotation/Constructor.java?rev=413250&r1=413249&r2=413250&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/annotation/Constructor.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/annotation/Constructor.java Fri Jun 9 22:34:19 2006
@@ -16,10 +16,10 @@
*/
package org.apache.tuscany.spi.annotation;
-import static java.lang.annotation.ElementType.CONSTRUCTOR;
import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
+import static java.lang.annotation.ElementType.CONSTRUCTOR;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
/**
* @version $Rev$ $Date$
Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/annotation/Monitor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/annotation/Monitor.java?rev=413250&r1=413249&r2=413250&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/annotation/Monitor.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/annotation/Monitor.java Fri Jun 9 22:34:19 2006
@@ -26,7 +26,7 @@
*
* @version $Rev$ $Date$
*/
-@Target({ElementType.METHOD, ElementType.FIELD})
+@Target({ElementType.METHOD, ElementType.FIELD })
@Retention(RetentionPolicy.RUNTIME)
public @interface Monitor {
}
Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/bootstrap/ComponentNames.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/bootstrap/ComponentNames.java?rev=413250&r1=413249&r2=413250&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/bootstrap/ComponentNames.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/bootstrap/ComponentNames.java Fri Jun 9 22:34:19 2006
@@ -22,9 +22,6 @@
* @version $Rev$ $Date$
*/
public final class ComponentNames {
- private ComponentNames() {
- }
-
/**
* The name of the component that forms the root of the runtime tree.
*/
@@ -44,4 +41,8 @@
* The name of the component that contains the deployer.
*/
public static final String TUSCANY_DEPLOYER = "tuscany.deployer";
+
+ private ComponentNames() {
+ }
+
}
Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/builder/BindingBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/builder/BindingBuilder.java?rev=413250&r1=413249&r2=413250&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/builder/BindingBuilder.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/builder/BindingBuilder.java Fri Jun 9 22:34:19 2006
@@ -31,7 +31,11 @@
* @version $Rev$ $Date$
*/
public interface BindingBuilder<B extends Binding> {
- SCAObject build(CompositeComponent parent, BoundServiceDefinition<B> boundServiceDefinition, DeploymentContext deploymentContext);
+ SCAObject build(CompositeComponent parent,
+ BoundServiceDefinition<B> boundServiceDefinition,
+ DeploymentContext deploymentContext);
- SCAObject build(CompositeComponent parent, BoundReferenceDefinition<B> boundReferenceDefinition, DeploymentContext deploymentContext);
+ SCAObject build(CompositeComponent parent,
+ BoundReferenceDefinition<B> boundReferenceDefinition,
+ DeploymentContext deploymentContext);
}
Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/builder/Builder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/builder/Builder.java?rev=413250&r1=413249&r2=413250&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/builder/Builder.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/builder/Builder.java Fri Jun 9 22:34:19 2006
@@ -40,15 +40,21 @@
* @param deploymentContext the current deployment context
* @return a newly created component
*/
- <I extends Implementation<?>> Component<?> build(CompositeComponent<?> parent, ComponentDefinition<I> componentDefinition, DeploymentContext deploymentContext);
+ <I extends Implementation<?>> Component<?> build(CompositeComponent<?> parent,
+ ComponentDefinition<I> componentDefinition,
+ DeploymentContext deploymentContext);
/**
* TODO: JavaDoc this when we know if we will still register Services as contexts
*/
- <B extends Binding> SCAObject build(CompositeComponent parent, BoundServiceDefinition<B> boundServiceDefinition, DeploymentContext deploymentContext);
+ <B extends Binding> SCAObject build(CompositeComponent parent,
+ BoundServiceDefinition<B> boundServiceDefinition,
+ DeploymentContext deploymentContext);
/**
* TODO: JavaDoc this when we know if we will still register References as contexts
*/
- <B extends Binding> SCAObject build(CompositeComponent parent, BoundReferenceDefinition<B> boundReferenceDefinition, DeploymentContext deploymentContext);
+ <B extends Binding> SCAObject build(CompositeComponent parent,
+ BoundReferenceDefinition<B> boundReferenceDefinition,
+ DeploymentContext deploymentContext);
}
Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/builder/BuilderException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/builder/BuilderException.java?rev=413250&r1=413249&r2=413250&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/builder/BuilderException.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/builder/BuilderException.java Fri Jun 9 22:34:19 2006
@@ -2,14 +2,14 @@
*
* Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
*
- * Licensed 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
+ * Licensed 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.
+ * 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.spi.builder;
Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/builder/ComponentBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/builder/ComponentBuilder.java?rev=413250&r1=413249&r2=413250&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/builder/ComponentBuilder.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/builder/ComponentBuilder.java Fri Jun 9 22:34:19 2006
@@ -29,5 +29,7 @@
* @version $Rev$ $Date$
*/
public interface ComponentBuilder<I extends Implementation<?>> {
- Component<?> build(CompositeComponent<?> parent, ComponentDefinition<I> componentDefinition, DeploymentContext deploymentContext) throws BuilderConfigException;
+ Component<?> build(CompositeComponent<?> parent,
+ ComponentDefinition<I> componentDefinition,
+ DeploymentContext deploymentContext) throws BuilderConfigException;
}
Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/AbstractSCAObject.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/AbstractSCAObject.java?rev=413250&r1=413249&r2=413250&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/AbstractSCAObject.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/AbstractSCAObject.java Fri Jun 9 22:34:19 2006
@@ -30,10 +30,11 @@
* @version $Rev$ $Date$
*/
public abstract class AbstractSCAObject<T> extends AbstractLifecycle implements SCAObject<T> {
+ protected static final EventFilter TRUE_FILTER = new TrueFilter();
+
+ protected Map<EventFilter, List<RuntimeEventListener>> listeners;
private final String name;
private final CompositeComponent parent;
- protected Map<EventFilter, List<RuntimeEventListener>> listeners;
- protected static final EventFilter TRUE_FILTER = new TrueFilter();
public AbstractSCAObject(String name, CompositeComponent<?> parent) {
this.name = name;
@@ -53,7 +54,7 @@
}
public void removeListener(RuntimeEventListener listener) {
- assert (listener != null) : "Listener cannot be null";
+ assert listener != null : "Listener cannot be null";
synchronized (getListeners()) {
for (List<RuntimeEventListener> currentList : getListeners().values()) {
for (RuntimeEventListener current : currentList) {
@@ -67,7 +68,7 @@
}
public void addListener(EventFilter filter, RuntimeEventListener listener) {
- assert (listener != null) : "Listener cannot be null";
+ assert listener != null : "Listener cannot be null";
synchronized (getListeners()) {
List<RuntimeEventListener> list = getListeners().get(filter);
if (list == null) {
@@ -79,7 +80,7 @@
}
public void publish(Event event) {
- assert(event != null): "Event object was null";
+ assert event != null : "Event object was null";
for (Map.Entry<EventFilter, List<RuntimeEventListener>> entry : getListeners().entrySet()) {
if (entry.getKey().match(event)) {
for (RuntimeEventListener listener : entry.getValue()) {
Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/ComponentRuntimeException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/ComponentRuntimeException.java?rev=413250&r1=413249&r2=413250&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/ComponentRuntimeException.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/ComponentRuntimeException.java Fri Jun 9 22:34:19 2006
@@ -1,15 +1,18 @@
/**
- *
- * Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- * Licensed 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.
+ *
+ * Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
+ *
+ * Licensed 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.spi.component;
Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/Reference.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/Reference.java?rev=413250&r1=413249&r2=413250&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/Reference.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/Reference.java Fri Jun 9 22:34:19 2006
@@ -17,18 +17,18 @@
/**
* Returns the service interface configured for the reference
*/
- public Class<T> getInterface();
+ Class<T> getInterface();
/**
* Returns the handler responsible for flowing a request through the reference
*
* @throws TargetException
*/
- public WireInvocationHandler getHandler() throws TargetException;
+ WireInvocationHandler getHandler() throws TargetException;
- public InboundWire<T> getInboundWire();
+ InboundWire<T> getInboundWire();
- public OutboundWire<T> getOutboundWire();
+ OutboundWire<T> getOutboundWire();
/**
* Callback to create a {@link org.apache.tuscany.spi.wire.TargetInvoker} which dispatches to the target
Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/Service.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/Service.java?rev=413250&r1=413249&r2=413250&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/Service.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/Service.java Fri Jun 9 22:34:19 2006
@@ -16,20 +16,20 @@
*
* @throws TargetException
*/
- public WireInvocationHandler getHandler() throws TargetException;
+ WireInvocationHandler getHandler() throws TargetException;
/**
* Returns the service interface configured for the service
*/
- public Class<T> getInterface();
+ Class<T> getInterface();
- public InboundWire<T> getInboundWire();
+ InboundWire<T> getInboundWire();
- public void setInboundWire(InboundWire<T> wire);
+ void setInboundWire(InboundWire<T> wire);
- public OutboundWire<T> getOutboundWire();
+ OutboundWire<T> getOutboundWire();
- public void setOutboundWire(OutboundWire<T> wire);
+ void setOutboundWire(OutboundWire<T> wire);
}
Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/WorkContext.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/WorkContext.java?rev=413250&r1=413249&r2=413250&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/WorkContext.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/WorkContext.java Fri Jun 9 22:34:19 2006
@@ -10,31 +10,31 @@
/**
* Returns the composite where a remote request came in
*/
- public CompositeComponent getRemoteComponent();
+ CompositeComponent getRemoteComponent();
/**
* Sets the composite where a remote request came in
*/
- public void setRemoteComponent(CompositeComponent component);
+ void setRemoteComponent(CompositeComponent component);
/**
* Returns the unique key for the given identifier associated with the current request
*/
- public Object getIdentifier(Object type);
+ Object getIdentifier(Object type);
/**
* Sets the unique key for the given identifier associated with the current request
*/
- public void setIdentifier(Object type, Object identifier);
+ void setIdentifier(Object type, Object identifier);
/**
* Clears the unique key for the given identifier associated with the current request
*/
- public void clearIdentifier(Object type);
+ void clearIdentifier(Object type);
/**
* Clears all identifiers associated with the current request
*/
- public void clearIdentifiers();
+ void clearIdentifiers();
}
Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/deployer/Deployer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/deployer/Deployer.java?rev=413250&r1=413249&r2=413250&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/deployer/Deployer.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/deployer/Deployer.java Fri Jun 9 22:34:19 2006
@@ -38,5 +38,7 @@
* @param componentDefinition the component definition as parsed from an assembly
* @return the newly deployed component
*/
- <I extends Implementation<?>> SCAObject<?> deploy(CompositeComponent<?> parent, ComponentDefinition<I> componentDefinition) throws LoaderException;
+ <I extends Implementation<?>> SCAObject<?> deploy(CompositeComponent<?> parent,
+ ComponentDefinition<I> componentDefinition)
+ throws LoaderException;
}
Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/event/Event.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/event/Event.java?rev=413250&r1=413249&r2=413250&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/event/Event.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/event/Event.java Fri Jun 9 22:34:19 2006
@@ -23,6 +23,6 @@
/**
* Returns the source of the event
*/
- public Object getSource();
+ Object getSource();
}
Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/event/EventFilter.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/event/EventFilter.java?rev=413250&r1=413249&r2=413250&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/event/EventFilter.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/event/EventFilter.java Fri Jun 9 22:34:19 2006
@@ -23,6 +23,6 @@
/**
* Performs the actual evaluation on an event
*/
- public boolean match(Event event);
+ boolean match(Event event);
}
Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/event/EventPublisher.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/event/EventPublisher.java?rev=413250&r1=413249&r2=413250&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/event/EventPublisher.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/event/EventPublisher.java Fri Jun 9 22:34:19 2006
@@ -20,23 +20,23 @@
*/
public interface EventPublisher {
- public void publish(Event object);
+ void publish(Event object);
/**
* Registers a listener to receive notifications for the context
*/
- public void addListener(RuntimeEventListener listener);
+ void addListener(RuntimeEventListener listener);
/**
* Registers a listener to receive notifications for the context
*/
- public void addListener(EventFilter filter, RuntimeEventListener listener);
+ void addListener(EventFilter filter, RuntimeEventListener listener);
/**
* Removes a previously registered listener
*/
- public void removeListener(RuntimeEventListener listener);
+ void removeListener(RuntimeEventListener listener);
}
Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/event/RuntimeEventListener.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/event/RuntimeEventListener.java?rev=413250&r1=413249&r2=413250&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/event/RuntimeEventListener.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/event/RuntimeEventListener.java Fri Jun 9 22:34:19 2006
@@ -25,5 +25,5 @@
*/
public interface RuntimeEventListener extends EventListener {
- public void onEvent(Event event);
+ void onEvent(Event event);
}
Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/AtomicComponentExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/AtomicComponentExtension.java?rev=413250&r1=413249&r2=413250&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/AtomicComponentExtension.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/AtomicComponentExtension.java Fri Jun 9 22:34:19 2006
@@ -30,7 +30,10 @@
protected Map<String, List<OutboundWire>> referenceWires = new HashMap<String, List<OutboundWire>>();
protected WireService wireService;
- protected AtomicComponentExtension(String name, CompositeComponent<?> parent, ScopeContainer scopeContainer, WireService wireService) {
+ protected AtomicComponentExtension(String name,
+ CompositeComponent<?> parent,
+ ScopeContainer scopeContainer,
+ WireService wireService) {
super(name, parent);
this.scopeContainer = scopeContainer;
this.wireService = wireService;
@@ -64,7 +67,7 @@
public InboundWire getInboundWire(String serviceName) {
if (serviceName == null) {
- if (serviceWires.size() <1){
+ if (serviceWires.size() < 1) {
return null;
}
return serviceWires.values().iterator().next();
@@ -85,7 +88,7 @@
}
public void addOutboundWires(Class<?> multiplicityClass, List<OutboundWire> wires) {
- assert(wires != null && wires.size() > 0);
+ assert wires != null && wires.size() > 0;
referenceWires.put(wires.get(0).getReferenceName(), wires);
onReferenceWires(multiplicityClass, wires);
}
Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/BindingBuilderExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/BindingBuilderExtension.java?rev=413250&r1=413249&r2=413250&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/BindingBuilderExtension.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/BindingBuilderExtension.java Fri Jun 9 22:34:19 2006
@@ -39,11 +39,15 @@
builderRegistry.register(getBindingType(), this);
}
- public SCAObject build(CompositeComponent parent, BoundServiceDefinition<B> boundServiceDefinition, DeploymentContext deploymentContext) {
+ public SCAObject build(CompositeComponent parent,
+ BoundServiceDefinition<B> boundServiceDefinition,
+ DeploymentContext deploymentContext) {
return null;
}
- public SCAObject build(CompositeComponent parent, BoundReferenceDefinition<B> boundReferenceDefinition, DeploymentContext deploymentContext) {
+ public SCAObject build(CompositeComponent parent,
+ BoundReferenceDefinition<B> boundReferenceDefinition,
+ DeploymentContext deploymentContext) {
return null;
}
Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java?rev=413250&r1=413249&r2=413250&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java Fri Jun 9 22:34:19 2006
@@ -53,9 +53,9 @@
}
public void register(SCAObject child) {
- assert(child != null): "SCAObject was null";
+ assert child != null : "SCAObject was null";
if (children.get(child.getName()) != null) {
- DuplicateNameException e = new DuplicateNameException("A context is already registered with name");
+ DuplicateNameException e = new DuplicateNameException("A context is anlready registered with name");
e.setIdentifier(child.getName());
e.addContextName(getName());
throw e;
@@ -80,7 +80,7 @@
}
public SCAObject getChild(String name) {
- assert (name != null) : "Name was null";
+ assert name != null : "Name was null";
return children.get(name);
}
@@ -113,7 +113,8 @@
}
public T getServiceInstance() throws TargetException {
- return null; //TODO implement
+ //TODO implement
+ return null;
}
public Object getServiceInstance(String name) throws TargetException {
@@ -160,7 +161,7 @@
public InboundWire getInboundWire(String serviceName) {
SCAObject context = children.get(serviceName);
- if (context == null || !(context instanceof Service)) {
+ if (!(context instanceof Service)) {
throw new ComponentNotFoundException(serviceName);
}
return ((Service) context).getInboundWire();
Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/ReferenceExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/ReferenceExtension.java?rev=413250&r1=413249&r2=413250&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/ReferenceExtension.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/ReferenceExtension.java Fri Jun 9 22:34:19 2006
@@ -70,7 +70,7 @@
}
public T getServiceInstance() throws TargetException {
- return wireService.createProxy(inboundWire);// inboundWire.getTargetService();
+ return wireService.createProxy(inboundWire);
}
public WireInvocationHandler getHandler() throws TargetException {
@@ -80,9 +80,10 @@
}
public void prepare() {
- assert(inboundWire != null) :"Inbound wire not set";
+ assert inboundWire != null : "Inbound wire not set";
for (InboundInvocationChain chain : inboundWire.getInvocationChains().values()) {
- chain.setTargetInvoker(createTargetInvoker(outboundWire.getTargetName().getQualifiedName(), chain.getMethod()));
+ chain.setTargetInvoker(createTargetInvoker(outboundWire.getTargetName().getQualifiedName(),
+ chain.getMethod()));
chain.build();
}
}
Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/ServiceExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/ServiceExtension.java?rev=413250&r1=413249&r2=413250&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/ServiceExtension.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/ServiceExtension.java Fri Jun 9 22:34:19 2006
@@ -22,7 +22,8 @@
protected OutboundWire<T> outboundWire;
protected WireService wireService;
- public ServiceExtension(String name, CompositeComponent parent, WireService wireService) throws CoreRuntimeException {
+ public ServiceExtension(String name, CompositeComponent parent, WireService wireService)
+ throws CoreRuntimeException {
super(name, parent);
this.wireService = wireService;
}
@@ -57,7 +58,7 @@
}
public Class<T> getInterface() {
- assert(inboundWire != null): "Inbound wire not set";
+ assert inboundWire != null : "Inbound wire not set";
return inboundWire.getBusinessInterface();
}
Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/Loader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/Loader.java?rev=413250&r1=413249&r2=413250&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/Loader.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/Loader.java Fri Jun 9 22:34:19 2006
@@ -43,7 +43,8 @@
* @return the model object obtained by parsing the current element on the stream
* @throws XMLStreamException if there was a problem reading the stream
*/
- ModelObject load(XMLStreamReader reader, DeploymentContext deploymentContext) throws XMLStreamException, LoaderException;
+ ModelObject load(XMLStreamReader reader, DeploymentContext deploymentContext)
+ throws XMLStreamException, LoaderException;
/**
* Load a model object from a specified location.
@@ -54,7 +55,8 @@
* @return the model ojbect loaded from the document
* @throws LoaderException if there was a problem loading the document
*/
- <MO extends ModelObject> MO load(URL url, Class<MO> type, DeploymentContext deploymentContext) throws LoaderException;
+ <MO extends ModelObject> MO load(URL url, Class<MO> type, DeploymentContext deploymentContext)
+ throws LoaderException;
/**
* Load the component type definition for a given implementation. How the component type information is
@@ -66,5 +68,6 @@
* @param deploymentContext the current deployment context
* @throws LoaderException if there was a problem loading the component type definition
*/
- <I extends Implementation<?>> void loadComponentType(I implementation, DeploymentContext deploymentContext) throws LoaderException;
+ <I extends Implementation<?>> void loadComponentType(I implementation, DeploymentContext deploymentContext)
+ throws LoaderException;
}
Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/StAXPropertyFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/StAXPropertyFactory.java?rev=413250&r1=413249&r2=413250&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/StAXPropertyFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/StAXPropertyFactory.java Fri Jun 9 22:34:19 2006
@@ -40,5 +40,6 @@
* @throws XMLStreamException if there is a problem reading the stream
* @throws LoaderException if there is a problem creating the ObjectFactory
*/
- <T> ObjectFactory<T> createObjectFactory(XMLStreamReader reader, Property<T> property) throws XMLStreamException, LoaderException;
+ <T> ObjectFactory<T> createObjectFactory(XMLStreamReader reader, Property<T> property)
+ throws XMLStreamException, LoaderException;
}
Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/ComponentType.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/ComponentType.java?rev=413250&r1=413249&r2=413250&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/ComponentType.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/ComponentType.java Fri Jun 9 22:34:19 2006
@@ -24,7 +24,8 @@
*
* @version $Rev$ $Date$
*/
-public class ComponentType<S extends ServiceDefinition, R extends ReferenceDefinition, P extends Property<?>> extends ModelObject {
+public class ComponentType<S extends ServiceDefinition, R extends ReferenceDefinition, P extends Property<?>>
+ extends ModelObject {
private boolean eagerInit;
private final Map<String, S> services = new HashMap<String, S>();
private final Map<String, R> references = new HashMap<String, R>();
Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/CompositeComponentType.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/CompositeComponentType.java?rev=413250&r1=413249&r2=413250&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/CompositeComponentType.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/CompositeComponentType.java Fri Jun 9 22:34:19 2006
@@ -24,9 +24,12 @@
*
* @version $Rev$ $Date$
*/
-public class CompositeComponentType<S extends ServiceDefinition, R extends ReferenceDefinition, P extends Property<?>> extends ComponentType<S, R, P> {
+public class CompositeComponentType<S extends ServiceDefinition,
+ R extends ReferenceDefinition,
+ P extends Property<?>> extends ComponentType<S, R, P> {
private String name;
- private final Map<String, ComponentDefinition<? extends Implementation<?>>> components = new HashMap<String, ComponentDefinition<? extends Implementation<?>>>();
+ private final Map<String, ComponentDefinition<? extends Implementation<?>>> components =
+ new HashMap<String, ComponentDefinition<? extends Implementation<?>>>();
public String getName() {
return name;
Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/monitor/LogLevel.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/monitor/LogLevel.java?rev=413250&r1=413249&r2=413250&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/monitor/LogLevel.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/monitor/LogLevel.java Fri Jun 9 22:34:19 2006
@@ -16,10 +16,10 @@
*/
package org.apache.tuscany.spi.monitor;
-import static java.lang.annotation.ElementType.METHOD;
import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
/**
* Annotation that can be applied to methods in a monitoring interface to indicate to logging frameworks the
Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/policy/PolicyBuilderRegistry.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/policy/PolicyBuilderRegistry.java?rev=413250&r1=413249&r2=413250&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/policy/PolicyBuilderRegistry.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/policy/PolicyBuilderRegistry.java Fri Jun 9 22:34:19 2006
@@ -14,9 +14,9 @@
*/
public interface PolicyBuilderRegistry {
- public static final int INITIAL = 0;
- public static final int EXTENSION = 1;
- public static final int FINAL = 2;
+ int INITIAL = 0;
+ int EXTENSION = 1;
+ int FINAL = 2;
/**
* Registers a target-side policy builder. Called by extensions to register their builders.
@@ -24,7 +24,7 @@
* @param phase the phase hwne the builder must be run
* @param builder the builder to register
*/
- public void registerTargetBuilder(int phase, TargetPolicyBuilder builder);
+ void registerTargetBuilder(int phase, TargetPolicyBuilder builder);
/**
* Registers a source-side policy builder. Called by extensions to register their builders.
@@ -32,7 +32,7 @@
* @param phase the phase hwne the builder must be run
* @param builder the builder to register
*/
- public void registerSourceBuilder(int phase, SourcePolicyBuilder builder);
+ void registerSourceBuilder(int phase, SourcePolicyBuilder builder);
/**
* Evaluates source-side policy metadata for referenceDefinition and updates the curresponding collection
@@ -40,13 +40,13 @@
*
* @throws BuilderException
*/
- public void buildSource(ReferenceDefinition referenceDefinition, OutboundWire wire) throws BuilderException;
+ void buildSource(ReferenceDefinition referenceDefinition, OutboundWire wire) throws BuilderException;
/**
- * Evaluates target-side policy metadata for configured reference and updates the curresponding collection
- * of wire configurations
+ * Evaluates target-side policy metadata for configured reference and updates the curresponding
+ * collection of wire configurations
*
* @throws BuilderException
*/
- public void buildTarget(ServiceDefinition serviceDefinition, InboundWire wire) throws BuilderException;
+ void buildTarget(ServiceDefinition serviceDefinition, InboundWire wire) throws BuilderException;
}
Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/policy/SourcePolicyBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/policy/SourcePolicyBuilder.java?rev=413250&r1=413249&r2=413250&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/policy/SourcePolicyBuilder.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/policy/SourcePolicyBuilder.java Fri Jun 9 22:34:19 2006
@@ -12,6 +12,6 @@
*/
public interface SourcePolicyBuilder {
- public void build(ReferenceDefinition referenceDefinition, OutboundWire wire) throws BuilderException;
+ void build(ReferenceDefinition referenceDefinition, OutboundWire wire) throws BuilderException;
}
Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/policy/TargetPolicyBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/policy/TargetPolicyBuilder.java?rev=413250&r1=413249&r2=413250&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/policy/TargetPolicyBuilder.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/policy/TargetPolicyBuilder.java Fri Jun 9 22:34:19 2006
@@ -12,6 +12,6 @@
*/
public interface TargetPolicyBuilder {
- public void build(ServiceDefinition serviceDefinition, InboundWire<?> wire) throws BuilderException;
+ void build(ServiceDefinition serviceDefinition, InboundWire<?> wire) throws BuilderException;
}
Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/InvocationChain.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/InvocationChain.java?rev=413250&r1=413249&r2=413250&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/InvocationChain.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/InvocationChain.java Fri Jun 9 22:34:19 2006
@@ -56,12 +56,12 @@
/**
* Returns the request channel for the chain
*/
- public MessageChannel getRequestChannel();
+ MessageChannel getRequestChannel();
/**
* Returns the response channel for the chain
*/
- public MessageChannel getResponseChannel();
+ MessageChannel getResponseChannel();
/**
* Sets the target invoker to pass down the chain
@@ -111,12 +111,12 @@
/**
* Returns the target-side request channel when two chains are bridged
*/
- public MessageChannel getTargetRequestChannel();
+ MessageChannel getTargetRequestChannel();
/**
* Returns the target-side response channel when two chains are bridged
*/
- public MessageChannel getTargetResponseChannel();
+ MessageChannel getTargetResponseChannel();
/**
* Signals to the chain that its configuration is complete. Implementations may use this callback to
Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/Message.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/Message.java?rev=413250&r1=413249&r2=413250&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/Message.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/Message.java Fri Jun 9 22:34:19 2006
@@ -37,21 +37,21 @@
* Sets the target invoker to dispatch to when the message passes through the request side of the
* invocation chain
*/
- public void setTargetInvoker(TargetInvoker invoker);
+ void setTargetInvoker(TargetInvoker invoker);
/**
* Sets the target invoker to dispatch to when the message passes through the request side of the
* invocation chain
*/
- public TargetInvoker getTargetInvoker();
+ TargetInvoker getTargetInvoker();
/**
* Returns the callback channel
*/
- public MessageChannel getCallbackChannel();
+ MessageChannel getCallbackChannel();
/**
*
*/
- public Message getRelatedCallbackMessage();
+ Message getRelatedCallbackMessage();
}
Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/TargetInvoker.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/TargetInvoker.java?rev=413250&r1=413249&r2=413250&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/TargetInvoker.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/TargetInvoker.java Fri Jun 9 22:34:19 2006
@@ -32,35 +32,35 @@
*
* @throws InvocationTargetException
*/
- public Object invokeTarget(Object payload) throws InvocationTargetException;
+ Object invokeTarget(Object payload) throws InvocationTargetException;
/**
* Invokes an operation on a target with the given message
*
* @throws InvocationRuntimeException
*/
- public Message invoke(Message msg) throws InvocationRuntimeException;
+ Message invoke(Message msg) throws InvocationRuntimeException;
/**
* Determines whether the proxy can be cached on the client/source side
*/
- public boolean isCacheable();
+ boolean isCacheable();
/**
* Sets whether the target service instance may be cached by the invoker. This is a possible optimization
* when a wire is configured for a "down-scope" reference, i.e. a reference from a source of a shorter
* lifetime to a source of greater lifetime.
*/
- public void setCacheable(boolean cacheable);
+ void setCacheable(boolean cacheable);
/**
* Determines if the target invoker can be discarded during wire optimization
*/
- public boolean isOptimizable();
+ boolean isOptimizable();
/**
* Implementations must support deep cloning
*/
- public Object clone() throws CloneNotSupportedException;
+ Object clone() throws CloneNotSupportedException;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org