You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by lr...@apache.org on 2007/03/26 20:52:50 UTC
svn commit: r522586 - in
/incubator/tuscany/java/sca/runtime/services/contribution: ./
contribution-framework/ contribution-framework/src/
contribution-framework/src/main/ contribution-framework/src/main/java/
contribution-framework/src/main/java/org/ ...
Author: lresende
Date: Mon Mar 26 11:52:38 2007
New Revision: 522586
URL: http://svn.apache.org/viewvc?view=rev&rev=522586
Log:
Breaking contribution module into framework and implementation modules. Still need some work to do....
Added:
incubator/tuscany/java/sca/runtime/services/contribution/contribution/
incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/
incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/.checkstyle
incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/.pmd
incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/.ruleset
incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/LICENSE.txt
incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/NOTICE.txt
incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/pom.xml
incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/
incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/
incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/
incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/
incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/apache/
incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/apache/tuscany/
incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/apache/tuscany/services/
incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/apache/tuscany/services/contribution/
incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/apache/tuscany/services/contribution/model/
incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/apache/tuscany/services/contribution/model/ContentType.java
- copied, changed from r522410, incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/deployer/ContentType.java
incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/apache/tuscany/services/contribution/model/Contribution.java
- copied, changed from r522410, incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/Contribution.java
incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/apache/tuscany/services/contribution/model/ContributionImport.java
- copied, changed from r522410, incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/ContributionImport.java
incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/apache/tuscany/services/contribution/model/DeployedArtifact.java
- copied, changed from r522410, incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/DeployedArtifact.java
incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/apache/tuscany/services/contribution/spi/
incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/apache/tuscany/services/contribution/spi/AbstractContributionException.java
incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/apache/tuscany/services/contribution/spi/ContentTypeDescriber.java
- copied, changed from r522410, incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/deployer/ContentTypeDescriber.java
incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/apache/tuscany/services/contribution/spi/ContributionException.java
incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/apache/tuscany/services/contribution/spi/ContributionProcessor.java
- copied, changed from r522410, incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/deployer/ContributionProcessor.java
incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/apache/tuscany/services/contribution/spi/ContributionProcessorRegistry.java
- copied, changed from r522410, incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/deployer/ContributionProcessorRegistry.java
incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/apache/tuscany/services/contribution/spi/ContributionRepository.java
- copied, changed from r522410, incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/deployer/ContributionRepository.java
incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/apache/tuscany/services/contribution/spi/ContributionService.java
- copied, changed from r522410, incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/deployment/ContributionService.java
incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/apache/tuscany/services/contribution/spi/extension/
incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/apache/tuscany/services/contribution/spi/extension/ContributionProcessorExtension.java
- copied, changed from r522410, incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ContributionProcessorExtension.java
incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/resources/
incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/test/
incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/test/java/
incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/test/resources/
incubator/tuscany/java/sca/runtime/services/contribution/contribution/.checkstyle
- copied unchanged from r522410, incubator/tuscany/java/sca/runtime/services/contribution/.checkstyle
incubator/tuscany/java/sca/runtime/services/contribution/contribution/.pmd
- copied unchanged from r522410, incubator/tuscany/java/sca/runtime/services/contribution/.pmd
incubator/tuscany/java/sca/runtime/services/contribution/contribution/.ruleset
- copied unchanged from r522410, incubator/tuscany/java/sca/runtime/services/contribution/.ruleset
incubator/tuscany/java/sca/runtime/services/contribution/contribution/LICENSE.txt
- copied unchanged from r522410, incubator/tuscany/java/sca/runtime/services/contribution/LICENSE.txt
incubator/tuscany/java/sca/runtime/services/contribution/contribution/NOTICE.txt
- copied unchanged from r522410, incubator/tuscany/java/sca/runtime/services/contribution/NOTICE.txt
incubator/tuscany/java/sca/runtime/services/contribution/contribution/pom.xml
- copied, changed from r522410, incubator/tuscany/java/sca/runtime/services/contribution/pom.xml
incubator/tuscany/java/sca/runtime/services/contribution/contribution/src/
- copied from r522410, incubator/tuscany/java/sca/runtime/services/contribution/src/
Removed:
incubator/tuscany/java/sca/runtime/services/contribution/.checkstyle
incubator/tuscany/java/sca/runtime/services/contribution/.pmd
incubator/tuscany/java/sca/runtime/services/contribution/.ruleset
incubator/tuscany/java/sca/runtime/services/contribution/LICENSE.txt
incubator/tuscany/java/sca/runtime/services/contribution/NOTICE.txt
incubator/tuscany/java/sca/runtime/services/contribution/pom.xml
incubator/tuscany/java/sca/runtime/services/contribution/src/
Modified:
incubator/tuscany/java/sca/runtime/services/contribution/contribution/src/main/java/org/apache/tuscany/services/contribution/ContentTypeDescriberImpl.java
incubator/tuscany/java/sca/runtime/services/contribution/contribution/src/main/java/org/apache/tuscany/services/contribution/ContributionDirectoryWatcher.java
incubator/tuscany/java/sca/runtime/services/contribution/contribution/src/main/java/org/apache/tuscany/services/contribution/ContributionLoader.java
incubator/tuscany/java/sca/runtime/services/contribution/contribution/src/main/java/org/apache/tuscany/services/contribution/ContributionServiceImpl.java
incubator/tuscany/java/sca/runtime/services/contribution/contribution/src/main/java/org/apache/tuscany/services/contribution/InvalidContributionMetadataException.java
Added: incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/.checkstyle
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/.checkstyle?view=auto&rev=522586
==============================================================================
--- incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/.checkstyle (added)
+++ incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/.checkstyle Mon Mar 26 11:52:38 2007
@@ -0,0 +1,24 @@
+<?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.
+-->
+<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/java/sca/runtime/services/contribution/contribution-framework/.pmd
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/.pmd?view=auto&rev=522586
==============================================================================
--- incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/.pmd (added)
+++ incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/.pmd Mon Mar 26 11:52:38 2007
@@ -0,0 +1,20 @@
+<?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.
+-->
+<pmd><useProjectRuleSet>true</useProjectRuleSet><rules/></pmd>
Added: incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/.ruleset
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/.ruleset?view=auto&rev=522586
==============================================================================
--- incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/.ruleset (added)
+++ incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/.ruleset Mon Mar 26 11:52:38 2007
@@ -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/runtime/services/contribution/contribution-framework/LICENSE.txt
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/LICENSE.txt?view=auto&rev=522586
==============================================================================
--- incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/LICENSE.txt (added)
+++ incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/LICENSE.txt Mon Mar 26 11:52:38 2007
@@ -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.
Added: incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/NOTICE.txt
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/NOTICE.txt?view=auto&rev=522586
==============================================================================
--- incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/NOTICE.txt (added)
+++ incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/NOTICE.txt Mon Mar 26 11:52:38 2007
@@ -0,0 +1,14 @@
+${pom.name}
+Copyright (c) 2005 - 2006 The Apache Software Foundation
+
+Apache Tuscany is an effort undergoing incubation at The Apache Software
+Foundation (ASF), sponsored by the Apache Web Services PMC. Incubation is
+required of all newly accepted projects until a further review indicates that
+the infrastructure, communications, and decision making process have stabilized
+in a manner consistent with other successful ASF projects. While incubation
+status is not necessarily a reflection of the completeness or stability of the
+code, it does indicate that the project has yet to be fully endorsed by the ASF.
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
Added: incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/pom.xml?view=auto&rev=522586
==============================================================================
--- incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/pom.xml (added)
+++ incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/pom.xml Mon Mar 26 11:52:38 2007
@@ -0,0 +1,46 @@
+<?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.
+-->
+<project>
+ <parent>
+ <groupId>org.apache.tuscany.sca.runtime</groupId>
+ <artifactId>services</artifactId>
+ <version>2.0-alpha2-incubating-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.tuscany.sca.runtime.services.contribution</groupId>
+ <artifactId>contribution-framework</artifactId>
+ <name>Apache Tuscany SCA Contribution Services Framework</name>
+ <description>Apache Tuscany SCA Contribution Services Framework</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.osoa</groupId>
+ <artifactId>sca-api-r${scaSpecVersion}</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ </dependency>
+ </dependencies>
+</project>
Copied: incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/apache/tuscany/services/contribution/model/ContentType.java (from r522410, incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/deployer/ContentType.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/apache/tuscany/services/contribution/model/ContentType.java?view=diff&rev=522586&p1=incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/deployer/ContentType.java&r1=522410&p2=incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/apache/tuscany/services/contribution/model/ContentType.java&r2=522586
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/deployer/ContentType.java (original)
+++ incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/apache/tuscany/services/contribution/model/ContentType.java Mon Mar 26 11:52:38 2007
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.tuscany.spi.deployer;
+package org.apache.tuscany.services.contribution.model;
public interface ContentType {
/**
Copied: incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/apache/tuscany/services/contribution/model/Contribution.java (from r522410, incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/Contribution.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/apache/tuscany/services/contribution/model/Contribution.java?view=diff&rev=522586&p1=incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/Contribution.java&r1=522410&p2=incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/apache/tuscany/services/contribution/model/Contribution.java&r2=522586
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/Contribution.java (original)
+++ incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/apache/tuscany/services/contribution/model/Contribution.java Mon Mar 26 11:52:38 2007
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.tuscany.spi.model;
+package org.apache.tuscany.services.contribution.model;
import java.net.URI;
import java.net.URL;
Copied: incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/apache/tuscany/services/contribution/model/ContributionImport.java (from r522410, incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/ContributionImport.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/apache/tuscany/services/contribution/model/ContributionImport.java?view=diff&rev=522586&p1=incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/ContributionImport.java&r1=522410&p2=incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/apache/tuscany/services/contribution/model/ContributionImport.java&r2=522586
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/ContributionImport.java (original)
+++ incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/apache/tuscany/services/contribution/model/ContributionImport.java Mon Mar 26 11:52:38 2007
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.tuscany.spi.model;
+package org.apache.tuscany.services.contribution.model;
import java.net.URI;
@@ -26,7 +26,7 @@
*
* @version $Rev$ $Date$
*/
-public class ContributionImport extends ModelObject {
+public class ContributionImport{
private String namespace; // The namespace to be imported
private URI location; // Optional location to hint the where it should be imported
Copied: incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/apache/tuscany/services/contribution/model/DeployedArtifact.java (from r522410, incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/DeployedArtifact.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/apache/tuscany/services/contribution/model/DeployedArtifact.java?view=diff&rev=522586&p1=incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/DeployedArtifact.java&r1=522410&p2=incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/apache/tuscany/services/contribution/model/DeployedArtifact.java&r2=522586
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/DeployedArtifact.java (original)
+++ incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/apache/tuscany/services/contribution/model/DeployedArtifact.java Mon Mar 26 11:52:38 2007
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.tuscany.spi.model;
+package org.apache.tuscany.services.contribution.model;
import java.net.URI;
import java.net.URL;
@@ -29,7 +29,7 @@
*
* @version $Rev$ $Date$
*/
-public class DeployedArtifact extends ModelObject {
+public class DeployedArtifact {
protected Contribution contribution;
protected URI uri;
protected URL location;
Added: incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/apache/tuscany/services/contribution/spi/AbstractContributionException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/apache/tuscany/services/contribution/spi/AbstractContributionException.java?view=auto&rev=522586
==============================================================================
--- incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/apache/tuscany/services/contribution/spi/AbstractContributionException.java (added)
+++ incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/apache/tuscany/services/contribution/spi/AbstractContributionException.java Mon Mar 26 11:52:38 2007
@@ -0,0 +1,124 @@
+/*
+ * 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.services.contribution.spi;
+
+import java.io.PrintWriter;
+
+/**
+ * The root checked exception for the Contribution Service.
+ *
+ * @version $Rev: 508877 $ $Date: 2007-02-17 22:22:48 -0800 (Sat, 17 Feb 2007) $
+ */
+public abstract class AbstractContributionException extends Exception {
+ private static final long serialVersionUID = -7847121698339635268L;
+ private final String identifier;
+
+ /**
+ * Override constructor from Exception.
+ *
+ * @see Exception
+ */
+ public AbstractContributionException() {
+ super();
+ this.identifier = null;
+ }
+
+ /**
+ * Override constructor from Exception.
+ *
+ * @param message passed to Exception
+ * @see Exception
+ */
+ public AbstractContributionException(String message) {
+ super(message);
+ this.identifier = null;
+ }
+
+ /**
+ * Override constructor from Exception.
+ *
+ * @param message passed to Exception
+ * @param identifier additional error information referred to in the error message
+ * @see Exception
+ */
+ public AbstractContributionException(String message, String identifier) {
+ super(message);
+ this.identifier = identifier;
+ }
+
+ /**
+ * Override constructor from Exception.
+ *
+ * @param message passed to Exception
+ * @param cause passed to Exception
+ * @see Exception
+ */
+ public AbstractContributionException(String message, Throwable cause) {
+ super(message, cause);
+ this.identifier = null;
+ }
+
+ /**
+ * Override constructor from Exception.
+ *
+ * @param message passed to Exception
+ * @param identifier additional error information referred to in the error message
+ * @param cause passed to Exception
+ * @see Exception
+ */
+ public AbstractContributionException(String message, String identifier, Throwable cause) {
+ super(message, cause);
+ this.identifier = identifier;
+ }
+
+ /**
+ * Override constructor from Exception.
+ *
+ * @param cause passed to Exception
+ * @see Exception
+ */
+ public AbstractContributionException(Throwable cause) {
+ super(cause);
+ this.identifier = null;
+ }
+
+ /**
+ * Returns a string representing additional error information referred to in the error message.
+ *
+ * @return additional error information
+ */
+ public String getIdentifier() {
+ return identifier;
+ }
+
+ public PrintWriter appendBaseMessage(PrintWriter writer) {
+ if (identifier == null) {
+ if (super.getMessage() == null) {
+ return writer;
+ }
+ return writer.append(super.getMessage());
+ }
+ if (super.getMessage() != null) {
+ writer.append(super.getMessage());
+ }
+ writer.append(" [").append(identifier).append(']');
+ return writer;
+ }
+
+}
Copied: incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/apache/tuscany/services/contribution/spi/ContentTypeDescriber.java (from r522410, incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/deployer/ContentTypeDescriber.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/apache/tuscany/services/contribution/spi/ContentTypeDescriber.java?view=diff&rev=522586&p1=incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/deployer/ContentTypeDescriber.java&r1=522410&p2=incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/apache/tuscany/services/contribution/spi/ContentTypeDescriber.java&r2=522586
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/deployer/ContentTypeDescriber.java (original)
+++ incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/apache/tuscany/services/contribution/spi/ContentTypeDescriber.java Mon Mar 26 11:52:38 2007
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.tuscany.spi.deployer;
+package org.apache.tuscany.services.contribution.spi;
import java.net.URL;
Added: incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/apache/tuscany/services/contribution/spi/ContributionException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/apache/tuscany/services/contribution/spi/ContributionException.java?view=auto&rev=522586
==============================================================================
--- incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/apache/tuscany/services/contribution/spi/ContributionException.java (added)
+++ incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/apache/tuscany/services/contribution/spi/ContributionException.java Mon Mar 26 11:52:38 2007
@@ -0,0 +1,56 @@
+/*
+ * 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.services.contribution.spi;
+
+
+/**
+ * Base class for exceptions raised by contribution services.
+ *
+ * @version $Rev: 519710 $ $Date: 2007-03-18 15:19:16 -0700 (Sun, 18 Mar 2007) $
+ */
+public class ContributionException extends AbstractContributionException {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 4432880414927652578L;
+
+ protected ContributionException() {
+ super();
+ }
+
+ protected ContributionException(String message) {
+ super(message);
+ }
+
+ protected ContributionException(String message, String identifier) {
+ super(message, identifier);
+ }
+
+ protected ContributionException(String message, Throwable cause) {
+ super(message, cause);
+ }
+
+ protected ContributionException(String message, String identifier, Throwable cause) {
+ super(message, identifier, cause);
+ }
+
+ public ContributionException(Throwable cause) {
+ super(cause);
+ }
+}
Copied: incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/apache/tuscany/services/contribution/spi/ContributionProcessor.java (from r522410, incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/deployer/ContributionProcessor.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/apache/tuscany/services/contribution/spi/ContributionProcessor.java?view=diff&rev=522586&p1=incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/deployer/ContributionProcessor.java&r1=522410&p2=incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/apache/tuscany/services/contribution/spi/ContributionProcessor.java&r2=522586
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/deployer/ContributionProcessor.java (original)
+++ incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/apache/tuscany/services/contribution/spi/ContributionProcessor.java Mon Mar 26 11:52:38 2007
@@ -16,14 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.spi.deployer;
+package org.apache.tuscany.services.contribution.spi;
import java.io.IOException;
import java.io.InputStream;
import java.net.URI;
-import org.apache.tuscany.host.deployment.DeploymentException;
-import org.apache.tuscany.spi.model.Contribution;
+import org.apache.tuscany.services.contribution.model.Contribution;
/**
* Interface for services that can process contributions.
@@ -45,7 +44,7 @@
* @throws DeploymentException if there was a problem with the contribution
* @throws IOException if there was a problem reading the stream
*/
- void processContent(Contribution contribution, URI source, InputStream inputStream) throws DeploymentException,
+ void processContent(Contribution contribution, URI source, InputStream inputStream) throws ContributionException,
IOException;
/**
@@ -61,6 +60,6 @@
* @throws DeploymentException
* @throws IOException
*/
- void processModel(Contribution contribution, URI source, Object modelObject) throws DeploymentException,
+ void processModel(Contribution contribution, URI source, Object modelObject) throws ContributionException,
IOException;
}
Copied: incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/apache/tuscany/services/contribution/spi/ContributionProcessorRegistry.java (from r522410, incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/deployer/ContributionProcessorRegistry.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/apache/tuscany/services/contribution/spi/ContributionProcessorRegistry.java?view=diff&rev=522586&p1=incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/deployer/ContributionProcessorRegistry.java&r1=522410&p2=incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/apache/tuscany/services/contribution/spi/ContributionProcessorRegistry.java&r2=522586
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/deployer/ContributionProcessorRegistry.java (original)
+++ incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/apache/tuscany/services/contribution/spi/ContributionProcessorRegistry.java Mon Mar 26 11:52:38 2007
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.spi.deployer;
+package org.apache.tuscany.services.contribution.spi;
/**
* @version $Rev$ $Date$
Copied: incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/apache/tuscany/services/contribution/spi/ContributionRepository.java (from r522410, incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/deployer/ContributionRepository.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/apache/tuscany/services/contribution/spi/ContributionRepository.java?view=diff&rev=522586&p1=incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/deployer/ContributionRepository.java&r1=522410&p2=incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/apache/tuscany/services/contribution/spi/ContributionRepository.java&r2=522586
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/deployer/ContributionRepository.java (original)
+++ incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/apache/tuscany/services/contribution/spi/ContributionRepository.java Mon Mar 26 11:52:38 2007
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.tuscany.spi.deployer;
+package org.apache.tuscany.services.contribution.spi;
import java.io.IOException;
import java.io.InputStream;
Copied: incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/apache/tuscany/services/contribution/spi/ContributionService.java (from r522410, incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/deployment/ContributionService.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/apache/tuscany/services/contribution/spi/ContributionService.java?view=diff&rev=522586&p1=incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/deployment/ContributionService.java&r1=522410&p2=incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/apache/tuscany/services/contribution/spi/ContributionService.java&r2=522586
==============================================================================
--- incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/deployment/ContributionService.java (original)
+++ incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/apache/tuscany/services/contribution/spi/ContributionService.java Mon Mar 26 11:52:38 2007
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.host.deployment;
+package org.apache.tuscany.services.contribution.spi;
import java.io.IOException;
import java.io.InputStream;
@@ -41,7 +41,7 @@
* @throws DeploymentException if there was a problem with the contribution
* @throws IOException if there was a problem reading the resource
*/
- URI contribute(URL contribution, boolean storeInRepository) throws DeploymentException, IOException;
+ URI contribute(URL contribution, boolean storeInRepository) throws ContributionException, IOException;
/**
* Contribute an artifact to the SCA Domain.
@@ -55,14 +55,14 @@
* @throws IOException if there was a problem reading the stream
*/
URI contribute(URI source, InputStream contribution, boolean storeInRepository)
- throws DeploymentException, IOException;
+ throws ContributionException, IOException;
/**
* Remove a contribution from the SCA domain
* @param contribution The URI of the contribution
* @throws DeploymentException if there was a problem with the contribution
*/
- void remove(URI contribution) throws DeploymentException;
+ void remove(URI contribution) throws ContributionException;
/**
* Resolve an artifact by QName within the contribution
Copied: incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/apache/tuscany/services/contribution/spi/extension/ContributionProcessorExtension.java (from r522410, incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ContributionProcessorExtension.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/apache/tuscany/services/contribution/spi/extension/ContributionProcessorExtension.java?view=diff&rev=522586&p1=incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ContributionProcessorExtension.java&r1=522410&p2=incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/apache/tuscany/services/contribution/spi/extension/ContributionProcessorExtension.java&r2=522586
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ContributionProcessorExtension.java (original)
+++ incubator/tuscany/java/sca/runtime/services/contribution/contribution-framework/src/main/java/org/apache/tuscany/services/contribution/spi/extension/ContributionProcessorExtension.java Mon Mar 26 11:52:38 2007
@@ -17,16 +17,15 @@
* under the License.
*/
-package org.apache.tuscany.spi.extension;
+package org.apache.tuscany.services.contribution.spi.extension;
+import org.apache.tuscany.services.contribution.spi.ContributionProcessor;
+import org.apache.tuscany.services.contribution.spi.ContributionProcessorRegistry;
import org.osoa.sca.annotations.Destroy;
import org.osoa.sca.annotations.EagerInit;
import org.osoa.sca.annotations.Init;
import org.osoa.sca.annotations.Reference;
import org.osoa.sca.annotations.Service;
-
-import org.apache.tuscany.spi.deployer.ContributionProcessor;
-import org.apache.tuscany.spi.deployer.ContributionProcessorRegistry;
/**
* The base class for ContributionProcessor implementations
Copied: incubator/tuscany/java/sca/runtime/services/contribution/contribution/pom.xml (from r522410, incubator/tuscany/java/sca/runtime/services/contribution/pom.xml)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/services/contribution/contribution/pom.xml?view=diff&rev=522586&p1=incubator/tuscany/java/sca/runtime/services/contribution/pom.xml&r1=522410&p2=incubator/tuscany/java/sca/runtime/services/contribution/contribution/pom.xml&r2=522586
==============================================================================
--- incubator/tuscany/java/sca/runtime/services/contribution/pom.xml (original)
+++ incubator/tuscany/java/sca/runtime/services/contribution/contribution/pom.xml Mon Mar 26 11:52:38 2007
@@ -19,15 +19,15 @@
-->
<project>
<parent>
- <groupId>org.apache.tuscany.sca.runtime</groupId>
- <artifactId>services</artifactId>
+ <groupId>org.apache.tuscany.sca.runtime.services.contribution</groupId>
+ <artifactId>contribution</artifactId>
<version>2.0-alpha2-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.tuscany.sca.runtime.services.contribution</groupId>
- <artifactId>contribution</artifactId>
- <name>Apache Tuscany SCA Contribution Services</name>
- <description>Apache Tuscany SCA Contribution Services</description>
+ <artifactId>contribution-contribution</artifactId>
+ <name>Apache Tuscany SCA Contribution Services Implementation</name>
+ <description>Apache Tuscany SCA Contribution Services Implementation</description>
<dependencies>
<dependency>
@@ -35,8 +35,13 @@
<artifactId>sca-api-r${scaSpecVersion}</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca.kernel</groupId>
- <artifactId>tuscany-spi</artifactId>
+ <groupId>org.apache.tuscany.sca.runtime.services.contribution</groupId>
+ <artifactId>contribution-framework</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: incubator/tuscany/java/sca/runtime/services/contribution/contribution/src/main/java/org/apache/tuscany/services/contribution/ContentTypeDescriberImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/services/contribution/contribution/src/main/java/org/apache/tuscany/services/contribution/ContentTypeDescriberImpl.java?view=diff&rev=522586&r1=522410&r2=522586
==============================================================================
--- incubator/tuscany/java/sca/runtime/services/contribution/contribution/src/main/java/org/apache/tuscany/services/contribution/ContentTypeDescriberImpl.java (original)
+++ incubator/tuscany/java/sca/runtime/services/contribution/contribution/src/main/java/org/apache/tuscany/services/contribution/ContentTypeDescriberImpl.java Mon Mar 26 11:52:38 2007
@@ -28,7 +28,7 @@
import org.osoa.sca.annotations.EagerInit;
import org.osoa.sca.annotations.Service;
-import org.apache.tuscany.spi.deployer.ContentTypeDescriber;
+import org.apache.tuscany.services.contribution.spi.ContentTypeDescriber;
import org.apache.tuscany.services.contribution.util.FileHelper;
Modified: incubator/tuscany/java/sca/runtime/services/contribution/contribution/src/main/java/org/apache/tuscany/services/contribution/ContributionDirectoryWatcher.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/services/contribution/contribution/src/main/java/org/apache/tuscany/services/contribution/ContributionDirectoryWatcher.java?view=diff&rev=522586&r1=522410&r2=522586
==============================================================================
--- incubator/tuscany/java/sca/runtime/services/contribution/contribution/src/main/java/org/apache/tuscany/services/contribution/ContributionDirectoryWatcher.java (original)
+++ incubator/tuscany/java/sca/runtime/services/contribution/contribution/src/main/java/org/apache/tuscany/services/contribution/ContributionDirectoryWatcher.java Mon Mar 26 11:52:38 2007
@@ -22,14 +22,13 @@
import java.io.File;
import java.io.IOException;
+import org.apache.tuscany.services.contribution.spi.ContributionException;
+import org.apache.tuscany.services.contribution.spi.ContributionService;
import org.osoa.sca.annotations.EagerInit;
import org.osoa.sca.annotations.Init;
import org.osoa.sca.annotations.Property;
import org.osoa.sca.annotations.Reference;
-import org.apache.tuscany.host.deployment.ContributionService;
-import org.apache.tuscany.host.deployment.DeploymentException;
-
@EagerInit
public class ContributionDirectoryWatcher {
private final String path;
@@ -58,7 +57,7 @@
} else {
this.contributionService.contribute(file.toURL(), true);
}
- } catch (DeploymentException de) {
+ } catch (ContributionException de) {
// FIXME handle this
de.printStackTrace();
} catch (IOException ioe) {
Modified: incubator/tuscany/java/sca/runtime/services/contribution/contribution/src/main/java/org/apache/tuscany/services/contribution/ContributionLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/services/contribution/contribution/src/main/java/org/apache/tuscany/services/contribution/ContributionLoader.java?view=diff&rev=522586&r1=522410&r2=522586
==============================================================================
--- incubator/tuscany/java/sca/runtime/services/contribution/contribution/src/main/java/org/apache/tuscany/services/contribution/ContributionLoader.java (original)
+++ incubator/tuscany/java/sca/runtime/services/contribution/contribution/src/main/java/org/apache/tuscany/services/contribution/ContributionLoader.java Mon Mar 26 11:52:38 2007
@@ -28,31 +28,24 @@
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import org.apache.tuscany.spi.deployer.DeploymentContext;
-import org.apache.tuscany.spi.extension.LoaderExtension;
-import org.apache.tuscany.spi.loader.InvalidValueException;
-import org.apache.tuscany.spi.loader.LoaderException;
-import org.apache.tuscany.spi.loader.LoaderRegistry;
-import org.apache.tuscany.spi.model.Contribution;
-import org.apache.tuscany.spi.model.ContributionImport;
-import org.apache.tuscany.spi.model.ModelObject;
+import org.apache.tuscany.services.contribution.model.Contribution;
+import org.apache.tuscany.services.contribution.model.ContributionImport;
import org.osoa.sca.annotations.Constructor;
import org.osoa.sca.annotations.Reference;
/**
- * Loader that handles <include> elements.
+ * Loader that handles contribution metadata files
*
* @version $Rev: 515261 $ $Date: 2007-03-06 11:22:46 -0800 (Tue, 06 Mar 2007) $
*/
-public class ContributionLoader extends LoaderExtension<Contribution> {
+public class ContributionLoader {
private static final QName CONTRIBUTION = new QName(SCA_NS, "contribution");
private static final QName DEPLOYABLE = new QName(SCA_NS, "deployable");
private static final QName IMPORT = new QName(SCA_NS, "import");
private static final QName EXPORT = new QName(SCA_NS, "export");
- @Constructor({"registry"})
- public ContributionLoader(@Reference LoaderRegistry registry) {
- super(registry);
+ public ContributionLoader() {
+ super();
}
public QName getXMLType() {
Modified: incubator/tuscany/java/sca/runtime/services/contribution/contribution/src/main/java/org/apache/tuscany/services/contribution/ContributionServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/services/contribution/contribution/src/main/java/org/apache/tuscany/services/contribution/ContributionServiceImpl.java?view=diff&rev=522586&r1=522410&r2=522586
==============================================================================
--- incubator/tuscany/java/sca/runtime/services/contribution/contribution/src/main/java/org/apache/tuscany/services/contribution/ContributionServiceImpl.java (original)
+++ incubator/tuscany/java/sca/runtime/services/contribution/contribution/src/main/java/org/apache/tuscany/services/contribution/ContributionServiceImpl.java Mon Mar 26 11:52:38 2007
@@ -27,15 +27,13 @@
import java.util.Map;
import java.util.UUID;
-import org.osoa.sca.annotations.Reference;
-
-import org.apache.tuscany.spi.deployer.ContributionProcessorRegistry;
-import org.apache.tuscany.spi.deployer.ContributionRepository;
-import org.apache.tuscany.spi.model.Contribution;
-
+import org.apache.tuscany.services.contribution.model.Contribution;
+import org.apache.tuscany.services.contribution.spi.ContributionException;
+import org.apache.tuscany.services.contribution.spi.ContributionProcessorRegistry;
+import org.apache.tuscany.services.contribution.spi.ContributionRepository;
+import org.apache.tuscany.services.contribution.spi.ContributionService;
import org.apache.tuscany.services.contribution.util.IOHelper;
-import org.apache.tuscany.host.deployment.ContributionService;
-import org.apache.tuscany.host.deployment.DeploymentException;
+import org.osoa.sca.annotations.Reference;
/**
* @version $Rev$ $Date$
@@ -61,7 +59,7 @@
this.processorRegistry = processorRegistry;
}
- public URI contribute(URL contribution, boolean storeInRepository) throws DeploymentException, IOException {
+ public URI contribute(URL contribution, boolean storeInRepository) throws ContributionException, IOException {
if (contribution == null) {
throw new IllegalArgumentException("contribution is null");
}
@@ -82,7 +80,7 @@
}
public URI contribute(URI source, InputStream contributionStream, boolean storeInRepository)
- throws DeploymentException, IOException {
+ throws ContributionException, IOException {
if (source == null) {
throw new IllegalArgumentException("source URI for contribution is null");
}
@@ -118,7 +116,7 @@
return this.contributionRegistry.get(id);
}
- public void remove(URI contribution) throws DeploymentException {
+ public void remove(URI contribution) throws ContributionException {
//remove from repository
this.contributionRegistry.remove(contribution);
//remove from registry
Modified: incubator/tuscany/java/sca/runtime/services/contribution/contribution/src/main/java/org/apache/tuscany/services/contribution/InvalidContributionMetadataException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/services/contribution/contribution/src/main/java/org/apache/tuscany/services/contribution/InvalidContributionMetadataException.java?view=diff&rev=522586&r1=522410&r2=522586
==============================================================================
--- incubator/tuscany/java/sca/runtime/services/contribution/contribution/src/main/java/org/apache/tuscany/services/contribution/InvalidContributionMetadataException.java (original)
+++ incubator/tuscany/java/sca/runtime/services/contribution/contribution/src/main/java/org/apache/tuscany/services/contribution/InvalidContributionMetadataException.java Mon Mar 26 11:52:38 2007
@@ -18,14 +18,20 @@
*/
package org.apache.tuscany.services.contribution;
-import org.apache.tuscany.host.deployment.DeploymentException;
+import org.apache.tuscany.services.contribution.spi.ContributionException;
+
/**
* Exception that indicates that the supplied XML Document invalid.
*
* @version $Rev: 511466 $ $Date: 2007-02-25 00:45:22 -0800 (Sun, 25 Feb 2007) $
*/
-public class InvalidContributionMetadataException extends DeploymentException {
+public class InvalidContributionMetadataException extends ContributionException {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = -3184477070625689942L;
protected InvalidContributionMetadataException() {
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org