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/11/04 16:06:07 UTC
svn commit: r471211 [1/2] - in
/incubator/tuscany/java/sca/services/containers/container.script: ./
src/main/java/org/apache/tuscany/container/script/
src/main/java/org/apache/tuscany/container/script/helper/
src/main/resources/META-INF/sca/ src/test/j...
Author: jmarino
Date: Sat Nov 4 07:06:05 2006
New Revision: 471211
URL: http://svn.apache.org/viewvc?view=rev&rev=471211
Log:
refactor script container to better use SPI and get it to compile against the trunk kernel; fix thread-safety issue with mutable propertes; remove dependency on core impl classes; cleanup some of the test cases; fix checkstyle warnings; fix pmd failure
Added:
incubator/tuscany/java/sca/services/containers/container.script/.ruleset
incubator/tuscany/java/sca/services/containers/container.script/LICENSE.txt (with props)
incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ComponentConfiguration.java (with props)
incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/MissingSideFileException.java (with props)
incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptComponent.java
- copied, changed from r471107, incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/helper/ScriptHelperComponent.java
incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptComponentBuilder.java
- copied, changed from r471107, incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/helper/ScriptHelperComponentBuilder.java
incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptComponentType.java
- copied, changed from r471107, incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/helper/ScriptHelperComponentType.java
incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptComponentTypeLoader.java
- copied, changed from r471107, incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/helper/ScriptHelperComponentTypeLoader.java
incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptImplementation.java
- copied, changed from r471107, incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/helper/ScriptHelperImplementation.java
incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptInstance.java (with props)
incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptInstanceImpl.java
- copied, changed from r471107, incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptInstance.java
incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptTargetInvoker.java
- copied, changed from r471107, incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/helper/ScriptHelperInvoker.java
incubator/tuscany/java/sca/services/containers/container.script/src/test/java/org/apache/tuscany/container/script/ScriptComponentBuilderTestCase.java
- copied, changed from r471107, incubator/tuscany/java/sca/services/containers/container.script/src/test/java/org/apache/tuscany/container/script/helper/ScriptHelperComponentBuilderTestCase.java
incubator/tuscany/java/sca/services/containers/container.script/src/test/java/org/apache/tuscany/container/script/ScriptComponentTestCase.java
- copied, changed from r471107, incubator/tuscany/java/sca/services/containers/container.script/src/test/java/org/apache/tuscany/container/script/helper/ScriptHelperComponentTestCase.java
incubator/tuscany/java/sca/services/containers/container.script/src/test/java/org/apache/tuscany/container/script/ScriptComponentTypeLoaderTestCase.java
- copied, changed from r471107, incubator/tuscany/java/sca/services/containers/container.script/src/test/java/org/apache/tuscany/container/script/helper/ScriptHelperComponentTypeLoaderTestCase.java
incubator/tuscany/java/sca/services/containers/container.script/src/test/java/org/apache/tuscany/container/script/ScriptComponentTypeTestCase.java
- copied, changed from r471107, incubator/tuscany/java/sca/services/containers/container.script/src/test/java/org/apache/tuscany/container/script/helper/ScriptHelperComponentTypeTestCase.java
incubator/tuscany/java/sca/services/containers/container.script/src/test/java/org/apache/tuscany/container/script/ScriptImplementationLoaderLoadingTestCase.java
- copied, changed from r471107, incubator/tuscany/java/sca/services/containers/container.script/src/test/java/org/apache/tuscany/container/script/helper/ScriptHelperImplementationLoaderTestCase.java
incubator/tuscany/java/sca/services/containers/container.script/src/test/java/org/apache/tuscany/container/script/ScriptImplementationTestCase.java
- copied, changed from r471107, incubator/tuscany/java/sca/services/containers/container.script/src/test/java/org/apache/tuscany/container/script/helper/ScriptHelperImplementationTestCase.java
incubator/tuscany/java/sca/services/containers/container.script/src/test/java/org/apache/tuscany/container/script/ScriptInstanceImplTestCase.java
- copied, changed from r471107, incubator/tuscany/java/sca/services/containers/container.script/src/test/java/org/apache/tuscany/container/script/ScriptInstanceTestCase.java
incubator/tuscany/java/sca/services/containers/container.script/src/test/java/org/apache/tuscany/container/script/ScriptInvokerTestCase.java
- copied, changed from r471107, incubator/tuscany/java/sca/services/containers/container.script/src/test/java/org/apache/tuscany/container/script/helper/ScriptHelperInvokerTestCase.java
Removed:
incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/helper/AsyncInvoker.java
incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/helper/AsyncMonitor.java
incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/helper/ScriptHelperComponent.java
incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/helper/ScriptHelperComponentBuilder.java
incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/helper/ScriptHelperComponentType.java
incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/helper/ScriptHelperComponentTypeLoader.java
incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/helper/ScriptHelperImplementation.java
incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/helper/ScriptHelperImplementationLoader.java
incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/helper/ScriptHelperInstance.java
incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/helper/ScriptHelperInstanceFactory.java
incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/helper/ScriptHelperInvoker.java
incubator/tuscany/java/sca/services/containers/container.script/src/test/java/org/apache/tuscany/container/script/ScriptInstanceTestCase.java
incubator/tuscany/java/sca/services/containers/container.script/src/test/java/org/apache/tuscany/container/script/helper/AsyncInvokerTestCase.java
incubator/tuscany/java/sca/services/containers/container.script/src/test/java/org/apache/tuscany/container/script/helper/ScriptHelperComponentBuilderTestCase.java
incubator/tuscany/java/sca/services/containers/container.script/src/test/java/org/apache/tuscany/container/script/helper/ScriptHelperComponentTestCase.java
incubator/tuscany/java/sca/services/containers/container.script/src/test/java/org/apache/tuscany/container/script/helper/ScriptHelperComponentTypeLoaderTestCase.java
incubator/tuscany/java/sca/services/containers/container.script/src/test/java/org/apache/tuscany/container/script/helper/ScriptHelperComponentTypeTestCase.java
incubator/tuscany/java/sca/services/containers/container.script/src/test/java/org/apache/tuscany/container/script/helper/ScriptHelperImplementationLoaderTestCase.java
incubator/tuscany/java/sca/services/containers/container.script/src/test/java/org/apache/tuscany/container/script/helper/ScriptHelperImplementationTestCase.java
incubator/tuscany/java/sca/services/containers/container.script/src/test/java/org/apache/tuscany/container/script/helper/ScriptHelperInstanceFactoryTestCase.java
incubator/tuscany/java/sca/services/containers/container.script/src/test/java/org/apache/tuscany/container/script/helper/ScriptHelperInvokerTestCase.java
incubator/tuscany/java/sca/services/containers/container.script/src/test/java/org/apache/tuscany/container/script/helper/mock/
Modified:
incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptImplementationLoader.java
incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptInstanceFactory.java
incubator/tuscany/java/sca/services/containers/container.script/src/main/resources/META-INF/sca/default.scdl
incubator/tuscany/java/sca/services/containers/container.script/src/main/resources/META-INF/sca/script.system.scdl
incubator/tuscany/java/sca/services/containers/container.script/src/test/java/org/apache/tuscany/container/script/ScriptInstanceFactoryTestCase.java
Added: incubator/tuscany/java/sca/services/containers/container.script/.ruleset
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.script/.ruleset?view=auto&rev=471211
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.script/.ruleset (added)
+++ incubator/tuscany/java/sca/services/containers/container.script/.ruleset Sat Nov 4 07:06:05 2006
@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<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>
Added: incubator/tuscany/java/sca/services/containers/container.script/LICENSE.txt
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.script/LICENSE.txt?view=auto&rev=471211
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.script/LICENSE.txt (added)
+++ incubator/tuscany/java/sca/services/containers/container.script/LICENSE.txt Sat Nov 4 07:06:05 2006
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, serviceDefinition marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ 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.
Propchange: incubator/tuscany/java/sca/services/containers/container.script/LICENSE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/services/containers/container.script/LICENSE.txt
------------------------------------------------------------------------------
svn:executable = *
Added: incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ComponentConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ComponentConfiguration.java?view=auto&rev=471211
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ComponentConfiguration.java (added)
+++ incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ComponentConfiguration.java Sat Nov 4 07:06:05 2006
@@ -0,0 +1,127 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tuscany.container.script;
+
+import java.util.List;
+
+import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.ScopeContainer;
+import org.apache.tuscany.spi.component.WorkContext;
+import org.apache.tuscany.spi.services.work.WorkScheduler;
+import org.apache.tuscany.spi.wire.WireService;
+import org.apache.tuscany.spi.extension.ExecutionMonitor;
+
+/**
+ * Configuration holder for creating script components
+ *
+ * @version $Rev$ $Date$
+ */
+public class ComponentConfiguration {
+
+ private String name;
+ private ScriptInstanceFactory factory;
+ private List<Class<?>> services;
+ private CompositeComponent parent;
+ private ScopeContainer scopeContainer;
+ private WireService wireService;
+ private WorkContext workContext;
+ private WorkScheduler workScheduler;
+ private ExecutionMonitor monitor;
+ private int initLevel;
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public ScriptInstanceFactory getFactory() {
+ return factory;
+ }
+
+ public void setFactory(ScriptInstanceFactory factory) {
+ this.factory = factory;
+ }
+
+ public List<Class<?>> getServices() {
+ return services;
+ }
+
+ public void setServices(List<Class<?>> services) {
+ this.services = services;
+ }
+
+ public CompositeComponent getParent() {
+ return parent;
+ }
+
+ public void setParent(CompositeComponent parent) {
+ this.parent = parent;
+ }
+
+ public ScopeContainer getScopeContainer() {
+ return scopeContainer;
+ }
+
+ public void setScopeContainer(ScopeContainer scopeContainer) {
+ this.scopeContainer = scopeContainer;
+ }
+
+ public WireService getWireService() {
+ return wireService;
+ }
+
+ public void setWireService(WireService wireService) {
+ this.wireService = wireService;
+ }
+
+ public WorkContext getWorkContext() {
+ return workContext;
+ }
+
+ public void setWorkContext(WorkContext workContext) {
+ this.workContext = workContext;
+ }
+
+ public WorkScheduler getWorkScheduler() {
+ return workScheduler;
+ }
+
+ public void setWorkScheduler(WorkScheduler workScheduler) {
+ this.workScheduler = workScheduler;
+ }
+
+ public ExecutionMonitor getMonitor() {
+ return monitor;
+ }
+
+ public void setMonitor(ExecutionMonitor monitor) {
+ this.monitor = monitor;
+ }
+
+ public int getInitLevel() {
+ return initLevel;
+ }
+
+ public void setInitLevel(int initLevel) {
+ this.initLevel = initLevel;
+ }
+}
Propchange: incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ComponentConfiguration.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ComponentConfiguration.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/MissingSideFileException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/MissingSideFileException.java?view=auto&rev=471211
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/MissingSideFileException.java (added)
+++ incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/MissingSideFileException.java Sat Nov 4 07:06:05 2006
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tuscany.container.script;
+
+import org.apache.tuscany.spi.loader.LoaderException;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class MissingSideFileException extends LoaderException {
+ public MissingSideFileException() {
+ }
+
+ public MissingSideFileException(String message) {
+ super(message);
+ }
+
+ public MissingSideFileException(String message, Throwable cause) {
+ super(message, cause);
+ }
+
+ public MissingSideFileException(Throwable cause) {
+ super(cause);
+ }
+}
Propchange: incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/MissingSideFileException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/MissingSideFileException.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptComponent.java (from r471107, incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/helper/ScriptHelperComponent.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptComponent.java?view=diff&rev=471211&p1=incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/helper/ScriptHelperComponent.java&r1=471107&p2=incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptComponent.java&r2=471211
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/helper/ScriptHelperComponent.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptComponent.java Sat Nov 4 07:06:05 2006
@@ -16,102 +16,78 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.container.script.helper;
-
-import static org.apache.tuscany.spi.idl.java.JavaIDLUtils.findMethod;
+package org.apache.tuscany.container.script;
import java.lang.reflect.Method;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import org.apache.tuscany.spi.ObjectCreationException;
-import org.apache.tuscany.spi.component.CompositeComponent;
-import org.apache.tuscany.spi.component.ScopeContainer;
import org.apache.tuscany.spi.component.TargetException;
-import org.apache.tuscany.spi.component.WorkContext;
import org.apache.tuscany.spi.extension.AtomicComponentExtension;
+import static org.apache.tuscany.spi.idl.java.JavaIDLUtils.findMethod;
import org.apache.tuscany.spi.model.Operation;
-import org.apache.tuscany.spi.services.work.WorkScheduler;
import org.apache.tuscany.spi.wire.InboundWire;
import org.apache.tuscany.spi.wire.OutboundWire;
import org.apache.tuscany.spi.wire.TargetInvoker;
-import org.apache.tuscany.spi.wire.WireService;
+import org.apache.tuscany.spi.wire.WireObjectFactory;
/**
* A component implementation for script languages.
*/
-public class ScriptHelperComponent extends AtomicComponentExtension {
-
+public class ScriptComponent extends AtomicComponentExtension {
private final List<Class<?>> services;
+ private ScriptInstanceFactory factory;
- private final Map<String, Object> properties;
-
- protected ScriptHelperInstanceFactory instanceFactory;
-
- public ScriptHelperComponent(String name, ScriptHelperInstanceFactory instanceFactory, Map<String, Object> properties, List<Class<?>> services, CompositeComponent parent, ScopeContainer scopeContainer,
- WireService wireService, WorkContext workContext, WorkScheduler workScheduler) {
-
- super(name, parent, scopeContainer, wireService, workContext, workScheduler, null, 0);
-
- this.instanceFactory = instanceFactory;
- this.services = services;
- this.scope = scopeContainer.getScope();
- this.properties = properties;
+ public ScriptComponent(ComponentConfiguration config) {
+ super(config.getName(),
+ config.getParent(),
+ config.getScopeContainer(),
+ config.getWireService(),
+ config.getWorkContext(),
+ config.getWorkScheduler(),
+ config.getMonitor(),
+ config.getInitLevel());
+ this.factory = config.getFactory();
+ this.services = config.getServices();
+ this.scope = config.getScopeContainer().getScope();
}
@SuppressWarnings("unchecked")
public Object createInstance() throws ObjectCreationException {
-
- Map<String, Object> context = new HashMap<String, Object>(getProperties());
-
- for (List<OutboundWire> referenceWires : getOutboundWires().values()) {
- for (OutboundWire wire : referenceWires) {
- Object wireProxy = wireService.createProxy(wire);
- context.put(wire.getReferenceName(), wireProxy);
- }
- }
-
- return instanceFactory.createInstance(services, context);
+ return factory.getInstance(); //(services, context);
}
-
- public TargetInvoker createTargetInvoker(String targetName, Operation operation, InboundWire callbackWire) {
+
+ public TargetInvoker createTargetInvoker(String targetName, Operation operation, InboundWire callbackWire) {
Method[] methods = operation.getServiceContract().getInterfaceClass().getMethods();
Method method = findMethod(operation, methods);
- return new ScriptHelperInvoker(method.getName(), this);
- }
-
- public TargetInvoker createAsyncTargetInvoker(InboundWire wire, Operation operation) {
- return new AsyncInvoker(operation.getName(), wire, this, workScheduler, null, workContext);
+ return new ScriptTargetInvoker(method.getName(), this);
}
- // TODO: move all the following up to AtomicComponentExtension?
-
public List<Class<?>> getServiceInterfaces() {
return services;
}
- public Map<String, Object> getProperties() {
- return properties;
- }
-
- public Object getTargetInstance() throws TargetException {
- return scopeContainer.getInstance(this);
- }
-
public Object getServiceInstance() throws TargetException {
return getServiceInstance(null);
}
+ protected void onReferenceWire(OutboundWire wire) {
+ factory.addContextObjectFactory(wire.getReferenceName(), new WireObjectFactory(wire, wireService));
+ }
+
@SuppressWarnings("unchecked")
public Object getServiceInstance(String service) throws TargetException {
InboundWire wire = getInboundWire(service);
if (wire == null) {
- TargetException e = new TargetException("ServiceDefinition not found"); // TODO better error message
+ TargetException e = new TargetException("Service not found"); // TODO better error message
e.setIdentifier(service);
throw e;
}
return wireService.createProxy(wire);
+ }
+
+ public Object getTargetInstance() throws TargetException {
+ return scopeContainer.getInstance(this);
}
}
Copied: incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptComponentBuilder.java (from r471107, incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/helper/ScriptHelperComponentBuilder.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptComponentBuilder.java?view=diff&rev=471211&p1=incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/helper/ScriptHelperComponentBuilder.java&r1=471107&p2=incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptComponentBuilder.java&r2=471211
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/helper/ScriptHelperComponentBuilder.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptComponentBuilder.java Sat Nov 4 07:06:05 2006
@@ -16,13 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.container.script.helper;
+package org.apache.tuscany.container.script;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import org.apache.tuscany.spi.builder.BuilderConfigException;
import org.apache.tuscany.spi.component.Component;
@@ -38,22 +36,22 @@
/**
* Extension point for creating {@link ScriptComponent}s from an assembly configuration
*/
-public class ScriptHelperComponentBuilder extends ComponentBuilderExtension<ScriptHelperImplementation> {
+public class ScriptComponentBuilder extends ComponentBuilderExtension<ScriptImplementation> {
- public ScriptHelperComponentBuilder() {
+ public ScriptComponentBuilder() {
}
- protected Class<ScriptHelperImplementation> getImplementationType() {
- return ScriptHelperImplementation.class;
+ protected Class<ScriptImplementation> getImplementationType() {
+ return ScriptImplementation.class;
}
@SuppressWarnings("unchecked")
- public Component build(CompositeComponent parent, ComponentDefinition<ScriptHelperImplementation> componentDefinition,
- DeploymentContext deploymentContext) throws BuilderConfigException {
+ public Component build(CompositeComponent parent, ComponentDefinition<ScriptImplementation> componentDefinition,
+ DeploymentContext deploymentContext) throws BuilderConfigException {
String name = componentDefinition.getName();
- ScriptHelperImplementation implementation = componentDefinition.getImplementation();
- ScriptHelperComponentType componentType = implementation.getComponentType();
+ ScriptImplementation implementation = componentDefinition.getImplementation();
+ ScriptComponentType componentType = implementation.getComponentType();
// get list of services provided by this component
Collection<ServiceDefinition> collection = componentType.getServices().values();
@@ -62,12 +60,6 @@
services.add(serviceDefinition.getServiceContract().getInterfaceClass());
}
- // get the properties for the component
- Map<String, Object> properties = new HashMap<String, Object>();
- for (PropertyValue propertyValue : componentDefinition.getPropertyValues().values()) {
- properties.put(propertyValue.getName(), propertyValue.getValueFactory().getInstance());
- }
-
// TODO: have ComponentBuilderExtension pass ScopeContainer in on build method?
ScopeContainer scopeContainer;
Scope scope = componentType.getLifecycleScope();
@@ -76,8 +68,29 @@
} else {
scopeContainer = scopeRegistry.getScopeContainer(scope);
}
+ String className = implementation.getClassName();
+ String scriptSource = implementation.getScriptSource();
+ String scriptName = implementation.getScriptName();
+ ClassLoader cl = implementation.getClassLoader();
+ ScriptInstanceFactory instanceFactory =
+ new ScriptInstanceFactory(scriptName, className, scriptSource, cl);
+
+ // get the properties for the component
+ for (PropertyValue propertyValue : componentDefinition.getPropertyValues().values()) {
+ //TODO this is not safe for since multiple instances can share mutable properties
+ instanceFactory.addContextObjectFactory(propertyValue.getName(), propertyValue.getValueFactory());
+ }
- return new ScriptHelperComponent(name, implementation.getScriptInstanceFactory(), properties, services, parent, scopeContainer, wireService, workContext, workScheduler);
+ ComponentConfiguration config = new ComponentConfiguration();
+ config.setName(name);
+ config.setFactory(instanceFactory);
+ config.setServices(services);
+ config.setParent(parent);
+ config.setScopeContainer(scopeContainer);
+ config.setWireService(wireService);
+ config.setWorkContext(workContext);
+ config.setWorkScheduler(workScheduler);
+ return new ScriptComponent(config);
}
}
Copied: incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptComponentType.java (from r471107, incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/helper/ScriptHelperComponentType.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptComponentType.java?view=diff&rev=471211&p1=incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/helper/ScriptHelperComponentType.java&r1=471107&p2=incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptComponentType.java&r2=471211
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/helper/ScriptHelperComponentType.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptComponentType.java Sat Nov 4 07:06:05 2006
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.container.script.helper;
+package org.apache.tuscany.container.script;
import org.apache.tuscany.spi.model.ComponentType;
import org.apache.tuscany.spi.model.Property;
@@ -27,28 +27,12 @@
/**
* A componentType for script components
* TODO: need lifecycle methods init/destroy
- * TODO: really need a generic componentType that supports scope and lifecycle
*/
-public class ScriptHelperComponentType extends ComponentType<ServiceDefinition, ReferenceDefinition, Property<?>> {
+public class ScriptComponentType extends ComponentType<ServiceDefinition, ReferenceDefinition, Property<?>> {
private Scope lifecycleScope = Scope.MODULE;
- public ScriptHelperComponentType() {
- }
-
- @SuppressWarnings("unchecked")
- public ScriptHelperComponentType(ComponentType ct) {
- // TODO: A bit hacky but this is so the generic .componentType XML side file can be used for now
- setInitLevel(ct.getInitLevel());
- for (Object property : ct.getProperties().values()) {
- add((Property) property);
- }
- for (Object reference : ct.getReferences().values()) {
- add((ReferenceDefinition) reference);
- }
- for (Object service : ct.getServices().values()) {
- add((ServiceDefinition) service);
- }
+ public ScriptComponentType() {
}
public Scope getLifecycleScope() {
Copied: incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptComponentTypeLoader.java (from r471107, incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/helper/ScriptHelperComponentTypeLoader.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptComponentTypeLoader.java?view=diff&rev=471211&p1=incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/helper/ScriptHelperComponentTypeLoader.java&r1=471107&p2=incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptComponentTypeLoader.java&r2=471211
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/helper/ScriptHelperComponentTypeLoader.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptComponentTypeLoader.java Sat Nov 4 07:06:05 2006
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.container.script.helper;
+package org.apache.tuscany.container.script;
import java.net.URL;
@@ -29,35 +29,41 @@
/**
* ComponentType loader for script components
*/
-public class ScriptHelperComponentTypeLoader extends ComponentTypeLoaderExtension<ScriptHelperImplementation> {
+public class ScriptComponentTypeLoader extends ComponentTypeLoaderExtension<ScriptImplementation> {
- public ScriptHelperComponentTypeLoader() {
+ public ScriptComponentTypeLoader() {
}
@Override
- protected Class<ScriptHelperImplementation> getImplementationClass() {
- return ScriptHelperImplementation.class;
+ protected Class<ScriptImplementation> getImplementationClass() {
+ return ScriptImplementation.class;
}
- // TODO: must be possible to move all the following up in to ComponentTypeLoaderExtension
-
- public void load(CompositeComponent parent, ScriptHelperImplementation implementation, DeploymentContext deploymentContext) throws LoaderException {
+ public void load(CompositeComponent parent,
+ ScriptImplementation implementation,
+ DeploymentContext deploymentContext) throws LoaderException {
String sideFile = getSideFileName(implementation.getResourceName());
- URL resource = implementation.getScriptInstanceFactory().getClassLoader().getResource(sideFile);
- ScriptHelperComponentType componentType;
+ URL resource = implementation.getClassLoader().getResource(sideFile);
+ ScriptComponentType componentType;
if (resource == null) {
- throw new IllegalArgumentException("missing .componentType side file: " + sideFile);
+ MissingSideFileException e = new MissingSideFileException("Component type side file not found");
+ e.setIdentifier(sideFile);
+ throw e;
// TODO: or else implement introspection
} else {
- componentType = loadFromSidefile(resource, deploymentContext);
+ componentType = loadFromSidefile(parent, resource, deploymentContext);
}
implementation.setComponentType(componentType);
}
- protected ScriptHelperComponentType loadFromSidefile(URL url, DeploymentContext deploymentContext) throws LoaderException {
- ComponentType ct = loaderRegistry.load(null, null, url, ComponentType.class, deploymentContext);
- ScriptHelperComponentType scriptComponentType = new ScriptHelperComponentType(ct);
- return scriptComponentType;
+ @SuppressWarnings("unchecked")
+ protected ScriptComponentType loadFromSidefile(CompositeComponent parent,
+ URL url,
+ DeploymentContext deploymentContext)
+ throws LoaderException {
+ ScriptComponentType scriptComponentType = new ScriptComponentType();
+ return (ScriptComponentType) loaderRegistry
+ .load(parent, scriptComponentType, url, ComponentType.class, deploymentContext);
}
protected String getSideFileName(String resourceName) {
Copied: incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptImplementation.java (from r471107, incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/helper/ScriptHelperImplementation.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptImplementation.java?view=diff&rev=471211&p1=incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/helper/ScriptHelperImplementation.java&r1=471107&p2=incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptImplementation.java&r2=471211
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/helper/ScriptHelperImplementation.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptImplementation.java Sat Nov 4 07:06:05 2006
@@ -16,32 +16,77 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.container.script.helper;
+package org.apache.tuscany.container.script;
import org.apache.tuscany.spi.model.AtomicImplementation;
+//import org.apache.tuscany.container.script.helper.ScriptFactory;
+
/**
* Model object for a script implementation.
*/
-public class ScriptHelperImplementation extends AtomicImplementation<ScriptHelperComponentType> {
+public class ScriptImplementation extends AtomicImplementation<ScriptComponentType> {
private String resourceName;
-
- private ScriptHelperInstanceFactory scriptInstanceFactory;
+ private String className;
+ private String scriptSource;
+ private String scriptName;
+ private ClassLoader classLoader;
+
+// private ScriptFactory scriptFactory;
public String getResourceName() {
return resourceName;
}
-
+
public void setResourceName(String resourceName) {
this.resourceName = resourceName;
}
-
- public ScriptHelperInstanceFactory getScriptInstanceFactory() {
- return scriptInstanceFactory;
+
+ public String getClassName() {
+ return className;
+ }
+
+ public void setClassName(String className) {
+ this.className = className;
+ }
+
+ public String getScriptSource() {
+ return scriptSource;
+ }
+
+ public void setScriptSource(String scriptSource) {
+ this.scriptSource = scriptSource;
+ }
+
+// public ScriptFactory getScriptFactory() {
+// return scriptFactory;
+// }
+//
+// public void setScriptFactory(ScriptFactory scriptFactory) {
+// this.scriptFactory = scriptFactory;
+// }
+
+ public String getScriptName() {
+ return scriptName;
+ }
+
+ public void setScriptName(String scriptName) {
+ this.scriptName = scriptName;
+ }
+
+ public ClassLoader getClassLoader() {
+ return classLoader;
}
- public void setScriptInstanceFactory(ScriptHelperInstanceFactory scriptInstanceFactory) {
- this.scriptInstanceFactory = scriptInstanceFactory;
+ public void setClassLoader(ClassLoader classLoader) {
+ this.classLoader = classLoader;
}
+// public ScriptFactory getScriptInstanceFactory() {
+// return scriptFactory;
+// }
+//
+// public void setScriptInstanceFactory(ScriptFactory scriptFactory) {
+// this.scriptFactory = scriptFactory;
+// }
}
Modified: incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptImplementationLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptImplementationLoader.java?view=diff&rev=471211&r1=471210&r2=471211
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptImplementationLoader.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptImplementationLoader.java Sat Nov 4 07:06:05 2006
@@ -18,35 +18,38 @@
*/
package org.apache.tuscany.container.script;
-import static org.osoa.sca.Version.XML_NAMESPACE_1_0;
-
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.net.URL;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import org.apache.tuscany.container.script.helper.ScriptHelperImplementation;
-import org.apache.tuscany.container.script.helper.ScriptHelperImplementationLoader;
+import static org.osoa.sca.Version.XML_NAMESPACE_1_0;
+import org.osoa.sca.annotations.Constructor;
+
import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.deployer.DeploymentContext;
+import org.apache.tuscany.spi.extension.LoaderExtension;
import org.apache.tuscany.spi.loader.LoaderException;
import org.apache.tuscany.spi.loader.LoaderRegistry;
import org.apache.tuscany.spi.loader.LoaderUtil;
import org.apache.tuscany.spi.loader.MissingResourceException;
import org.apache.tuscany.spi.model.ModelObject;
-import org.osoa.sca.annotations.Constructor;
/**
* Loader for handling implementation.script elements.
- *
+ * <p/>
* <implementation.script script="path/foo.py" class="myclass">
- *
*/
-public class ScriptImplementationLoader extends ScriptHelperImplementationLoader {
+public class ScriptImplementationLoader extends LoaderExtension<ScriptImplementation> {
private static final QName IMPLEMENTATION_SCRIPT = new QName(XML_NAMESPACE_1_0, "implementation.script");
- @Constructor( { "registry" })
+ @Constructor({"registry"})
public ScriptImplementationLoader(@Autowire LoaderRegistry registry) {
super(registry);
}
@@ -55,7 +58,8 @@
return IMPLEMENTATION_SCRIPT;
}
- public ScriptHelperImplementation load(CompositeComponent parent, ModelObject mo, XMLStreamReader reader, DeploymentContext deploymentContext) throws XMLStreamException, LoaderException {
+ public ScriptImplementation load(CompositeComponent parent, ModelObject mo, XMLStreamReader reader,
+ DeploymentContext deploymentContext) throws XMLStreamException, LoaderException {
String scriptName = reader.getAttributeValue(null, "script");
if (scriptName == null) {
throw new MissingResourceException("implementation element has no 'script' attribute");
@@ -68,14 +72,53 @@
ClassLoader cl = deploymentContext.getClassLoader();
String scriptSource = loadSource(cl, scriptName);
- ScriptInstanceFactory instanceFactory = new ScriptInstanceFactory(scriptName, className, scriptSource, cl);
+// ScriptInstanceFactory instanceFactory = new ScriptInstanceFactory(scriptName, className, scriptSource, cl);
- ScriptHelperImplementation implementation = new ScriptHelperImplementation();
+ ScriptImplementation implementation = new ScriptImplementation();
implementation.setResourceName(scriptName);
- implementation.setScriptInstanceFactory(instanceFactory);
-
+ implementation.setScriptSource(scriptSource);
+ implementation.setClassName(className);
+ implementation.setScriptName(scriptName);
+ implementation.setClassLoader(cl);
+ //implementation.setScriptInstanceFactory(instanceFactory);
+
registry.loadComponentType(parent, implementation, deploymentContext);
return implementation;
+ }
+
+ protected String loadSource(ClassLoader cl, String resource) throws LoaderException {
+ URL url = cl.getResource(resource);
+ if (url == null) {
+ throw new MissingResourceException(resource);
+ }
+ InputStream is;
+ try {
+ is = url.openStream();
+ } catch (IOException e) {
+ MissingResourceException mre = new MissingResourceException(resource, e);
+ mre.setIdentifier(resource);
+ throw mre;
+ }
+ try {
+ Reader reader = new InputStreamReader(is, "UTF-8");
+ char[] buffer = new char[1024];
+ StringBuilder source = new StringBuilder();
+ int count;
+ while ((count = reader.read(buffer)) > 0) {
+ source.append(buffer, 0, count);
+ }
+ return source.toString();
+ } catch (IOException e) {
+ LoaderException le = new LoaderException(e);
+ le.setIdentifier(resource);
+ throw le;
+ } finally {
+ try {
+ is.close();
+ } catch (IOException e) {
+ // ignore
+ }
+ }
}
}
Added: incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptInstance.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptInstance.java?view=auto&rev=471211
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptInstance.java (added)
+++ incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptInstance.java Sat Nov 4 07:06:05 2006
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tuscany.container.script;
+
+import java.lang.reflect.InvocationTargetException;
+
+/**
+ * An invokable instance of a script
+ *
+ * Basically just a wrapper around a BSF engine with an optional script class object.
+ */
+public interface ScriptInstance {
+
+ Object invokeTarget(String operationName, Object[] args) throws InvocationTargetException;
+}
Propchange: incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptInstance.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptInstance.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptInstanceFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptInstanceFactory.java?view=diff&rev=471211&r1=471210&r2=471211
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptInstanceFactory.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptInstanceFactory.java Sat Nov 4 07:06:05 2006
@@ -18,52 +18,67 @@
*/
package org.apache.tuscany.container.script;
+import java.lang.reflect.Method;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.apache.tuscany.spi.ObjectCreationException;
+import org.apache.tuscany.spi.ObjectFactory;
+
import org.apache.bsf.BSFEngine;
import org.apache.bsf.BSFException;
import org.apache.bsf.BSFManager;
-import org.apache.tuscany.container.script.helper.ScriptHelperInstanceFactory;
-import org.apache.tuscany.spi.ObjectCreationException;
/**
- * ScriptInstanceFactory creates ScriptInstances for a script
+ * ScriptFactory creates ScriptInstances for a script
*/
-public class ScriptInstanceFactory extends ScriptHelperInstanceFactory<ScriptInstance>{
-
+public class ScriptInstanceFactory implements ObjectFactory<ScriptInstance> {
+ protected String resourceName;
+ protected ClassLoader classLoader;
private String className;
-
private String scriptSource;
+ private Map<String, ObjectFactory> contextObjects;
- public ScriptInstanceFactory(String resourceName, String className, String scriptSource, ClassLoader classLoader) {
- super(resourceName, classLoader);
+ public ScriptInstanceFactory(String resourceName,
+ String className,
+ String scriptSource,
+ ClassLoader classLoader) {
+ this.resourceName = resourceName;
+ this.classLoader = classLoader;
this.className = className;
this.scriptSource = scriptSource;
+ this.contextObjects = new HashMap<String, ObjectFactory>();
}
/**
* Create a new invokeable instance of the script
- *
- * @param context
- * objects to add to scope of the script instance
+ * <p/>
+ * objects to add to scope of the script instance
+ *
* @return a RhinoScriptInstance
*/
- public ScriptInstance createInstance(List<Class> services, Map<String, Object> context) {
+ //public ScriptInstanceImpl createInstance(List<Class<?>> services, Map<String, Object> context) {
+ public ScriptInstance getInstance() throws ObjectCreationException {
try {
//TODO: this uses a new manager and recompiles the scrip each time, may be able to optimize
// but need to be careful about instance scoping
-
+
BSFManager bsfManager = new BSFManager();
bsfManager.setClassLoader(BSFManager.class.getClassLoader());
-
+
// TODO: hack to get Ruby working with the standalone launcher
Thread.currentThread().setContextClassLoader(BSFManager.class.getClassLoader());
+// // register any context objects (SCA properties and references)
+// for (String beanName : context.keySet()) {
+// bsfManager.registerBean(beanName, context.get(beanName));
+// }
+
// register any context objects (SCA properties and references)
- for (String beanName : context.keySet()) {
- bsfManager.registerBean(beanName, context.get(beanName));
+ for (Map.Entry<String, ObjectFactory> entry : contextObjects.entrySet()) {
+ bsfManager.registerBean(entry.getKey(), entry.getValue().getInstance());
}
String scriptLanguage = BSFManager.getLangFromFilename(resourceName);
@@ -81,7 +96,7 @@
}
}
- return new ScriptInstance(bsfEngine, clazz);
+ return new ScriptInstanceImpl(bsfEngine, clazz);
} catch (BSFException e) {
if (e.getTargetException() != null) {
@@ -89,6 +104,30 @@
}
throw new ObjectCreationException(e.getTargetException());
}
+ }
+
+ public String getResourceName() {
+ return resourceName;
+ }
+
+ public ClassLoader getClassLoader() {
+ return classLoader;
+ }
+
+ protected Map<String, Class> getResponseClasses(List<Class> services) {
+ Map<String, Class> responseClasses = new HashMap<String, Class>();
+ if (services != null) {
+ for (Class s : services) {
+ for (Method m : s.getMethods()) {
+ responseClasses.put(m.getName(), m.getReturnType());
+ }
+ }
+ }
+ return responseClasses;
+ }
+
+ public void addContextObjectFactory(String name, ObjectFactory<?> factory) {
+ contextObjects.put(name, factory);
}
}
Copied: incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptInstanceImpl.java (from r471107, incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptInstance.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptInstanceImpl.java?view=diff&rev=471211&p1=incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptInstance.java&r1=471107&p2=incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptInstanceImpl.java&r2=471211
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptInstance.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptInstanceImpl.java Sat Nov 4 07:06:05 2006
@@ -21,29 +21,24 @@
import java.lang.reflect.InvocationTargetException;
import org.apache.bsf.BSFEngine;
-import org.apache.tuscany.container.script.helper.ScriptHelperInstance;
/**
* An invokable instance of a script
*
* Basically just a wrapper around a BSF engine with an optional script class object.
*/
-public class ScriptInstance implements ScriptHelperInstance {
-
+public class ScriptInstanceImpl implements ScriptInstance {
protected BSFEngine bsfEngine;
-
protected Object clazz;
- public ScriptInstance(BSFEngine bsfEngine, Object clazz) {
+ public ScriptInstanceImpl(BSFEngine bsfEngine, Object clazz) {
this.bsfEngine = bsfEngine;
this.clazz = clazz;
}
public Object invokeTarget(String operationName, Object[] args) throws InvocationTargetException {
try {
-
return bsfEngine.call(clazz, operationName, args);
-
} catch (Exception e) {
throw new InvocationTargetException(e);
}
Copied: incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptTargetInvoker.java (from r471107, incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/helper/ScriptHelperInvoker.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptTargetInvoker.java?view=diff&rev=471211&p1=incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/helper/ScriptHelperInvoker.java&r1=471107&p2=incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptTargetInvoker.java&r2=471211
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/helper/ScriptHelperInvoker.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptTargetInvoker.java Sat Nov 4 07:06:05 2006
@@ -16,36 +16,30 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.container.script.helper;
+package org.apache.tuscany.container.script;
import java.lang.reflect.InvocationTargetException;
import org.apache.tuscany.spi.extension.TargetInvokerExtension;
/**
- * TargetInvoker that calls a function on a ScriptInstance
+ * TargetInvoker implementation that calls a function on a ScriptInstanceImpl
*/
-public class ScriptHelperInvoker extends TargetInvokerExtension {
-
- protected ScriptHelperComponent component;
+public class ScriptTargetInvoker extends TargetInvokerExtension {
+ protected ScriptComponent component;
protected String functionName;
- public ScriptHelperInvoker(String functionName, ScriptHelperComponent component) {
- super(null, null, null);
+ public ScriptTargetInvoker(String functionName, ScriptComponent component) {
+ super(null, null, null);
this.functionName = functionName;
this.component = component;
}
- /**
- * Invoke the function
- */
public Object invokeTarget(final Object payload) throws InvocationTargetException {
- ScriptHelperInstance target = (ScriptHelperInstance) component.getTargetInstance();
+ ScriptInstance target = (ScriptInstance) component.getTargetInstance();
try {
-
return target.invokeTarget(functionName, (Object[]) payload);
-
} catch (Exception e) {
throw new InvocationTargetException(e);
}
Modified: incubator/tuscany/java/sca/services/containers/container.script/src/main/resources/META-INF/sca/default.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.script/src/main/resources/META-INF/sca/default.scdl?view=diff&rev=471211&r1=471210&r2=471211
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.script/src/main/resources/META-INF/sca/default.scdl (original)
+++ incubator/tuscany/java/sca/services/containers/container.script/src/main/resources/META-INF/sca/default.scdl Sat Nov 4 07:06:05 2006
@@ -30,11 +30,11 @@
</component>
<component name="script.componentTypeLoader">
- <system:implementation.system class="org.apache.tuscany.container.script.helper.ScriptHelperComponentTypeLoader"/>
+ <system:implementation.system class="org.apache.tuscany.container.script.ScriptComponentTypeLoader"/>
</component>
<component name="script.componentBuilder">
- <system:implementation.system class="org.apache.tuscany.container.script.helper.ScriptHelperComponentBuilder"/>
+ <system:implementation.system class="org.apache.tuscany.container.script.ScriptComponentBuilder"/>
</component>
</composite>
Modified: incubator/tuscany/java/sca/services/containers/container.script/src/main/resources/META-INF/sca/script.system.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.script/src/main/resources/META-INF/sca/script.system.scdl?view=diff&rev=471211&r1=471210&r2=471211
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.script/src/main/resources/META-INF/sca/script.system.scdl (original)
+++ incubator/tuscany/java/sca/services/containers/container.script/src/main/resources/META-INF/sca/script.system.scdl Sat Nov 4 07:06:05 2006
@@ -30,11 +30,11 @@
</component>
<component name="script.componentTypeLoader">
- <system:implementation.system class="org.apache.tuscany.container.script.helper.ScriptHelperComponentTypeLoader"/>
+ <system:implementation.system class="org.apache.tuscany.container.script.ScriptComponentTypeLoader"/>
</component>
<component name="script.componentBuilder">
- <system:implementation.system class="org.apache.tuscany.container.script.helper.ScriptHelperComponentBuilder"/>
+ <system:implementation.system class="org.apache.tuscany.container.script.ScriptComponentBuilder"/>
</component>
</composite>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org