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/05/03 03:16:31 UTC
svn commit: r534672 - in /incubator/tuscany/java/sca/modules:
contribution-impl/src/main/java/org/apache/tuscany/contribution/impl/
contribution-impl/src/main/java/org/apache/tuscany/contribution/processor/impl/
contribution-impl/src/main/java/org/apac...
Author: lresende
Date: Wed May 2 18:16:29 2007
New Revision: 534672
URL: http://svn.apache.org/viewvc?view=rev&rev=534672
Log:
PMD & CheckStyle changes
Added:
incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/impl/ArtifactImpl.java
- copied, changed from r534621, incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/impl/BaseArtifactImpl.java
Removed:
incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/impl/BaseArtifactImpl.java
Modified:
incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/impl/ContributionImpl.java
incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/impl/ContributionImportImpl.java
incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/impl/DefaultContributionFactory.java
incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/impl/DeployedArtifactImpl.java
incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/processor/impl/DefaultPackageProcessorExtensionPoint.java
incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/service/impl/ContributionMetadataLoaderImpl.java
incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/service/impl/ContributionRepositoryImpl.java
incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/service/impl/ContributionServiceImpl.java
incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/service/util/FileHelper.java
incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/contribution/processor/FolderContributionPackageProcessorTestCase.java
incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/contribution/processor/JarContributionPackageProcessorTestCase.java
incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/contribution/services/ContributionMetadataLoaderTestCase.java
incubator/tuscany/java/sca/modules/contribution-installer/src/main/java/org/apache/tuscany/contribution/installer/Main.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/Artifact.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/ContentType.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/Contribution.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/ContributionImport.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/DeployedArtifact.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/ArtifactProcessorExtensionPoint.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/DefaultArtifactProcessorExtensionPoint.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/StAXArtifactProcessorExtensionPoint.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/service/ContributionMetadataLoader.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/service/ContributionMetadataLoaderException.java
Copied: incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/impl/ArtifactImpl.java (from r534621, incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/impl/BaseArtifactImpl.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/impl/ArtifactImpl.java?view=diff&rev=534672&p1=incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/impl/BaseArtifactImpl.java&r1=534621&p2=incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/impl/ArtifactImpl.java&r2=534672
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/impl/BaseArtifactImpl.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/impl/ArtifactImpl.java Wed May 2 18:16:29 2007
@@ -24,11 +24,11 @@
import org.apache.tuscany.contribution.Artifact;
-public class BaseArtifactImpl implements Artifact {
+public class ArtifactImpl implements Artifact {
protected URI uri;
protected URL location;
- protected BaseArtifactImpl(){
+ protected ArtifactImpl() {
}
Modified: incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/impl/ContributionImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/impl/ContributionImpl.java?view=diff&rev=534672&r1=534671&r2=534672
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/impl/ContributionImpl.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/impl/ContributionImpl.java Wed May 2 18:16:29 2007
@@ -36,7 +36,7 @@
*
* @version $Rev: 531146 $ $Date: 2007-04-21 22:40:50 -0700 (Sat, 21 Apr 2007) $
*/
-public class ContributionImpl extends BaseArtifactImpl implements Contribution {
+public class ContributionImpl extends ArtifactImpl implements Contribution {
protected List<String> exports = new ArrayList<String>();
protected List<ContributionImport> imports = new ArrayList<ContributionImport>();
protected List<Composite> deployables = new ArrayList<Composite>();
Modified: incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/impl/ContributionImportImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/impl/ContributionImportImpl.java?view=diff&rev=534672&r1=534671&r2=534672
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/impl/ContributionImportImpl.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/impl/ContributionImportImpl.java Wed May 2 18:16:29 2007
@@ -32,7 +32,7 @@
private String namespace; // The namespace to be imported
private URI location; // Optional location to hint the where it should be imported
- protected ContributionImportImpl(){
+ protected ContributionImportImpl() {
}
Modified: incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/impl/DefaultContributionFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/impl/DefaultContributionFactory.java?view=diff&rev=534672&r1=534671&r2=534672
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/impl/DefaultContributionFactory.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/impl/DefaultContributionFactory.java Wed May 2 18:16:29 2007
@@ -27,7 +27,7 @@
import org.apache.tuscany.contribution.DeployedArtifact;
public class DefaultContributionFactory implements ContributionFactory {
- public DefaultContributionFactory(){
+ public DefaultContributionFactory() {
}
@@ -53,7 +53,7 @@
return deployedArtifact;
}
- public ContributionImport createContributionImport(){
+ public ContributionImport createContributionImport() {
return new ContributionImportImpl();
}
}
Modified: incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/impl/DeployedArtifactImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/impl/DeployedArtifactImpl.java?view=diff&rev=534672&r1=534671&r2=534672
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/impl/DeployedArtifactImpl.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/impl/DeployedArtifactImpl.java Wed May 2 18:16:29 2007
@@ -19,8 +19,6 @@
package org.apache.tuscany.contribution.impl;
-import java.net.URI;
-
import org.apache.tuscany.contribution.Contribution;
import org.apache.tuscany.contribution.DeployedArtifact;
@@ -29,7 +27,7 @@
*
* @version $Rev: 527398 $ $Date: 2007-04-10 23:43:31 -0700 (Tue, 10 Apr 2007) $
*/
-public class DeployedArtifactImpl extends BaseArtifactImpl implements DeployedArtifact {
+public class DeployedArtifactImpl extends ArtifactImpl implements DeployedArtifact {
protected Contribution contribution;
protected Object modelObject;
@@ -49,7 +47,7 @@
return modelObject;
}
- public void setModelObject(Object modelObject){
+ public void setModelObject(Object modelObject) {
this.modelObject = modelObject;
}
}
Modified: incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/processor/impl/DefaultPackageProcessorExtensionPoint.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/processor/impl/DefaultPackageProcessorExtensionPoint.java?view=diff&rev=534672&r1=534671&r2=534672
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/processor/impl/DefaultPackageProcessorExtensionPoint.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/processor/impl/DefaultPackageProcessorExtensionPoint.java Wed May 2 18:16:29 2007
@@ -37,7 +37,7 @@
/**
* Default implementation of ContributionProcessorRegistry
- *
+ *
* @version $Rev$ $Date$
*/
public class DefaultPackageProcessorExtensionPoint implements PackageProcessorExtensionPoint {
@@ -45,6 +45,7 @@
* Processor registry
*/
private Map<String, PackageProcessorExtension> registry = new HashMap<String, PackageProcessorExtension>();
+
/**
* Helper method to describe contentType for each artifact
*/
@@ -66,7 +67,8 @@
registry.remove(contentType);
}
- public List<URI> getArtifacts(URL packageSourceURL,InputStream inputStream) throws ContributionException, IOException{
+ public List<URI> getArtifacts(URL packageSourceURL, InputStream inputStream)
+ throws ContributionException, IOException {
String contentType = this.packageTypeDescriber.getType(packageSourceURL, null);
if (contentType == null) {
throw new UnsupportedContentTypeException("Unsupported contribution package", packageSourceURL.toString());
@@ -79,13 +81,10 @@
return packageProcessor.getArtifacts(packageSourceURL, inputStream);
}
-
- /**
- * @see org.apache.tuscany.contribution.processor.PackageProcessorExtension#getArtifactURL(java.net.URL, java.net.URI)
- */
+
public URL getArtifactURL(URL packageSourceURL, URI artifact) throws MalformedURLException {
String contentType = this.packageTypeDescriber.getType(packageSourceURL, null);
PackageProcessorExtension packageProcessor = this.registry.get(contentType);
return packageProcessor.getArtifactURL(packageSourceURL, artifact);
- }
+ }
}
Modified: incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/service/impl/ContributionMetadataLoaderImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/service/impl/ContributionMetadataLoaderImpl.java?view=diff&rev=534672&r1=534671&r2=534672
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/service/impl/ContributionMetadataLoaderImpl.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/service/impl/ContributionMetadataLoaderImpl.java Wed May 2 18:16:29 2007
@@ -41,10 +41,9 @@
* @version $Rev: 515261 $ $Date: 2007-03-06 11:22:46 -0800 (Tue, 06 Mar 2007) $
*/
public class ContributionMetadataLoaderImpl implements ContributionMetadataLoader {
- //FIXME use this from constants ?
private static final String SCA10_NS = "http://www.osoa.org/xmlns/sca/1.0";
private static final String TARGET_NAMESPACE = "targetNamespace";
- private static final String NAME = "composite";
+ //private static final String NAME = "composite";
private static final QName CONTRIBUTION = new QName(SCA10_NS, "contribution");
private static final QName DEPLOYABLE = new QName(SCA10_NS, "deployable");
Modified: incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/service/impl/ContributionRepositoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/service/impl/ContributionRepositoryImpl.java?view=diff&rev=534672&r1=534671&r2=534672
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/service/impl/ContributionRepositoryImpl.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/service/impl/ContributionRepositoryImpl.java Wed May 2 18:16:29 2007
@@ -55,7 +55,7 @@
*/
public class ContributionRepositoryImpl implements ContributionRepository {
private static final String NS = "http://tuscany.apache.org/xmlns/1.0-SNAPSHOT";
- private static final String domainIndexFilename = "sca-domain.xml";
+ private static final String DOMAIN_INDEX_FILENAME = "sca-domain.xml";
private final File rootFile;
private Map<URI, String> contributionMap = new HashMap<URI, String>();
@@ -241,7 +241,7 @@
}
private void saveMap() {
- File domainFile = new File(rootFile, domainIndexFilename);
+ File domainFile = new File(rootFile, DOMAIN_INDEX_FILENAME);
FileOutputStream os = null;
try {
os = new FileOutputStream(domainFile);
Modified: incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/service/impl/ContributionServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/service/impl/ContributionServiceImpl.java?view=diff&rev=534672&r1=534671&r2=534672
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/service/impl/ContributionServiceImpl.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/service/impl/ContributionServiceImpl.java Wed May 2 18:16:29 2007
@@ -122,7 +122,8 @@
addContribution(contributionURI, sourceURL, null, storeInRepository);
}
- public void contribute(URI contributionURI, URL sourceURL, InputStream input) throws ContributionException, IOException {
+ public void contribute(URI contributionURI, URL sourceURL, InputStream input)
+ throws ContributionException, IOException {
addContribution(contributionURI, sourceURL, input, true);
}
@@ -183,32 +184,21 @@
public void addDeploymentComposite(URI contributionURI, Composite composite) throws ContributionException {
Contribution contribution = getContribution(contributionURI);
-
- if(contribution == null) {
- throw new InvalidContributionURIException("Invalid/Inexistent contribution uri '" + contributionURI.toString());
+
+ if (contribution == null) {
+ throw new InvalidContributionURIException("Invalid/Inexistent contribution uri '"
+ + contributionURI.toString());
}
-
+
URI compositeURI = contributionURI.resolve(composite.getName().getLocalPart() + ".composite");
DeployedArtifact artifact = this.contributionFactory.createDeplyedArtifact(compositeURI);
artifact.setModelObject(composite);
-
+
contribution.addArtifact(artifact);
-
+
contribution.getDeployables().add(composite);
}
- /*
- * public <T> T resolve(URI contribution, Class<T> definitionType, String
- * namespace, String name) { Contribution contributionObject =
- * getContribution(contribution); return
- * resolverRegistry.resolve(contributionObject, definitionType, namespace,
- * name, null); } public URL resolve(URI contribution, String namespace, URI
- * uri, URI baseURI) { Contribution contributionObject =
- * getContribution(contribution); return
- * resolverRegistry.resolve(contributionObject, namespace, uri.toString(),
- * baseURI.toString()); }
- */
-
public <M> M resolve(Class modelClass,
Class<M> elementClass,
Object modelKey,
@@ -331,8 +321,8 @@
//resolve deployables from contribution metadata
List<Composite> resolvedDeployables = new ArrayList<Composite>();
for (Composite deployableComposite : contribution.getDeployables()) {
- deployableComposite = artifactResolver.resolve(Composite.class, deployableComposite);
- resolvedDeployables.add(deployableComposite);
+ Composite resolvedDeployable = artifactResolver.resolve(Composite.class, deployableComposite);
+ resolvedDeployables.add(resolvedDeployable);
}
contribution.getDeployables().clear();
@@ -347,7 +337,7 @@
// for each artifact that was processed on the contribution
for (DeployedArtifact artifact : contribution.getArtifacts().values()) {
// resolve the model object
- this.artifactProcessor.wire(artifact.getModelObject());
+ this.artifactProcessor.wire(artifact.getModelObject());
}
}
@@ -360,7 +350,7 @@
* @throws ContributionException
*/
private void processDeployables(Contribution contribution) throws ContributionException {
- if (contribution.getDeployables() == null || contribution.getDeployables().size() == 0){
+ if (contribution.getDeployables() == null || contribution.getDeployables().size() == 0) {
//Contribution metadata not available with a list of deployables
//Promote all composites to deployable
for (DeployedArtifact deployedArtifact : contribution.getArtifacts().values()) {
Modified: incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/service/util/FileHelper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/service/util/FileHelper.java?view=diff&rev=534672&r1=534671&r2=534672
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/service/util/FileHelper.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/service/util/FileHelper.java Wed May 2 18:16:29 2007
@@ -513,7 +513,7 @@
throw new IOException("Source '" + srcFile + "' and destination '" + destFile + "' are the same");
}
if (!(destFile.getParentFile() != null && destFile.getParentFile().exists())) {
- if (!destFile.getParentFile().mkdirs()) {
+ if (!destFile.getParentFile().mkdirs()) { //NOPMD
throw new IOException("Destination '" + destFile + "' directory cannot be created");
}
}
Modified: incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/contribution/processor/FolderContributionPackageProcessorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/contribution/processor/FolderContributionPackageProcessorTestCase.java?view=diff&rev=534672&r1=534671&r2=534672
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/contribution/processor/FolderContributionPackageProcessorTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/contribution/processor/FolderContributionPackageProcessorTestCase.java Wed May 2 18:16:29 2007
@@ -24,7 +24,6 @@
import junit.framework.TestCase;
-import org.apache.tuscany.contribution.processor.PackageProcessorExtensionPoint;
import org.apache.tuscany.contribution.processor.impl.DefaultPackageProcessorExtensionPoint;
import org.apache.tuscany.contribution.processor.impl.FolderContributionProcessor;
import org.apache.tuscany.contribution.service.impl.PackageTypeDescriberImpl;
@@ -40,8 +39,10 @@
}
public final void testProcessPackageArtifacts() throws Exception {
- PackageProcessorExtensionPoint packageProcessors = new DefaultPackageProcessorExtensionPoint(new PackageTypeDescriberImpl());
- FolderContributionProcessor folderProcessor = new FolderContributionProcessor(packageProcessors);
+ PackageProcessorExtensionPoint packageProcessors =
+ new DefaultPackageProcessorExtensionPoint(new PackageTypeDescriberImpl());
+ FolderContributionProcessor folderProcessor =
+ new FolderContributionProcessor(packageProcessors);
List<URI> artifacts = folderProcessor.getArtifacts(contributionRoot.toURL(), null);
assertNotNull(artifacts);
Modified: incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/contribution/processor/JarContributionPackageProcessorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/contribution/processor/JarContributionPackageProcessorTestCase.java?view=diff&rev=534672&r1=534671&r2=534672
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/contribution/processor/JarContributionPackageProcessorTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/contribution/processor/JarContributionPackageProcessorTestCase.java Wed May 2 18:16:29 2007
@@ -25,7 +25,6 @@
import junit.framework.TestCase;
-import org.apache.tuscany.contribution.processor.PackageProcessorExtensionPoint;
import org.apache.tuscany.contribution.processor.impl.DefaultPackageProcessorExtensionPoint;
import org.apache.tuscany.contribution.processor.impl.JarContributionProcessor;
import org.apache.tuscany.contribution.service.impl.PackageTypeDescriberImpl;
@@ -39,19 +38,20 @@
}
public final void testProcessPackageArtifacts() throws Exception {
- PackageProcessorExtensionPoint packageProcessors = new DefaultPackageProcessorExtensionPoint(new PackageTypeDescriberImpl());
- JarContributionProcessor jarProcessor = new JarContributionProcessor(packageProcessors);
+ PackageProcessorExtensionPoint packageProcessors =
+ new DefaultPackageProcessorExtensionPoint(new PackageTypeDescriberImpl());
+ JarContributionProcessor jarProcessor =
+ new JarContributionProcessor(packageProcessors);
URL jarURL = getClass().getResource(JAR_CONTRIBUTION);
InputStream jarStream = jarURL.openStream();
List<URI> artifacts = null;
- try{
+ try {
artifacts = jarProcessor.getArtifacts(jarURL, jarStream);
- }finally{
+ } finally {
IOHelper.closeQuietly(jarStream);
}
assertNotNull(artifacts);
}
-
- }
+}
Modified: incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/contribution/services/ContributionMetadataLoaderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/contribution/services/ContributionMetadataLoaderTestCase.java?view=diff&rev=534672&r1=534671&r2=534672
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/contribution/services/ContributionMetadataLoaderTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/contribution/services/ContributionMetadataLoaderTestCase.java Wed May 2 18:16:29 2007
@@ -65,7 +65,8 @@
public void testLoad() throws Exception {
XMLStreamReader reader = xmlFactory.createXMLStreamReader(new StringReader(VALID_XML));
- ContributionMetadataLoaderImpl loader = new ContributionMetadataLoaderImpl(new DefaultAssemblyFactory(), new DefaultContributionFactory());
+ ContributionMetadataLoaderImpl loader =
+ new ContributionMetadataLoaderImpl(new DefaultAssemblyFactory(), new DefaultContributionFactory());
Contribution contribution = loader.load(reader);
assertNotNull(contribution);
assertEquals(1, contribution.getImports().size());
@@ -75,7 +76,8 @@
public void testLoadInvalid() throws Exception {
XMLStreamReader reader = xmlFactory.createXMLStreamReader(new StringReader(INVALID_XML));
- ContributionMetadataLoaderImpl loader = new ContributionMetadataLoaderImpl(new DefaultAssemblyFactory(), new DefaultContributionFactory());
+ ContributionMetadataLoaderImpl loader =
+ new ContributionMetadataLoaderImpl(new DefaultAssemblyFactory(), new DefaultContributionFactory());
try {
loader.load(reader);
fail("InvalidException should have been thrown");
Modified: incubator/tuscany/java/sca/modules/contribution-installer/src/main/java/org/apache/tuscany/contribution/installer/Main.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-installer/src/main/java/org/apache/tuscany/contribution/installer/Main.java?view=diff&rev=534672&r1=534671&r2=534672
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-installer/src/main/java/org/apache/tuscany/contribution/installer/Main.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-installer/src/main/java/org/apache/tuscany/contribution/installer/Main.java Wed May 2 18:16:29 2007
@@ -68,7 +68,8 @@
//start the process of installing the contribution
ContributionRepository contributionRepository = new ContributionRepositoryImpl(null);
- ContributionService contributionService = new ContributionServiceImpl(contributionRepository, null, null, null, new DefaultAssemblyFactory(), new DefaultContributionFactory());
+ ContributionService contributionService =
+ new ContributionServiceImpl(contributionRepository, null, null, null, new DefaultAssemblyFactory(), new DefaultContributionFactory());
URL contributionURL = contributionSource.toURL();
InputStream contributionStream = null;
Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/Artifact.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/Artifact.java?view=diff&rev=534672&r1=534671&r2=534672
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/Artifact.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/Artifact.java Wed May 2 18:16:29 2007
@@ -32,24 +32,24 @@
* Get the URI that unique identifies the artifact
* @return
*/
- public URI getUri();
+ URI getUri();
/**
* Set the URI that unique identifies the artifact
* @param uri
*/
- public void setURI(URI uri);
+ void setURI(URI uri);
/**
* Get the URL location for the artifact
* @return
*/
- public URL getLocation();
+ URL getLocation();
/**
* Set the URL location for the artifact
* @param location
*/
- public void setLocation(URL location);
+ void setLocation(URL location);
}
Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/ContentType.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/ContentType.java?view=diff&rev=534672&r1=534671&r2=534672
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/ContentType.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/ContentType.java Wed May 2 18:16:29 2007
@@ -23,21 +23,20 @@
/**
* Archive specific content types
*/
- public static final String JAR = "application/x-compressed";
- public static final String FOLDER = "application/vnd.tuscany.folder";
+ String JAR = "application/x-compressed";
+ String FOLDER = "application/vnd.tuscany.folder";
/**
* Artifact/File specific content types
*/
- public static final String CONTRIBUTION_METADATA = "application/vnd.tuscany.contribution.metadata";
- public static final String COMPOSITE = "application/vnd.tuscany.composite";
- public static final String WSDL = "application/vnd.tuscany.wsdl";
- public static final String JAVA = "application/java-vm";
+ String CONTRIBUTION_METADATA = "application/vnd.tuscany.contribution.metadata";
+ String COMPOSITE = "application/vnd.tuscany.composite";
+ String WSDL = "application/vnd.tuscany.wsdl";
+ String JAVA = "application/java-vm";
/**
* Unkown contentType
*/
-
- public static final String UNKNOWN = "content/unknown";
+ String UNKNOWN = "content/unknown";
}
Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/Contribution.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/Contribution.java?view=diff&rev=534672&r1=534671&r2=534672
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/Contribution.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/Contribution.java Wed May 2 18:16:29 2007
@@ -30,46 +30,46 @@
*
* @version $Rev$ $Date$
*/
-public interface Contribution extends Artifact{
- public static final String SCA_CONTRIBUTION_META = "META-INF/sca-contribution.xml";
- public static final String SCA_CONTRIBUTION_GENERATED_META = "META-INF/sca-contribution-generated.xml";
+public interface Contribution extends Artifact {
+ String SCA_CONTRIBUTION_META = "META-INF/sca-contribution.xml";
+ String SCA_CONTRIBUTION_GENERATED_META = "META-INF/sca-contribution-generated.xml";
/**
* Get a list of exports based on the Contribution metadata sidefile
* @return
*/
- public List<String> getExports();
+ List<String> getExports();
/**
* Get a list of imports based on the Contribution metadata sidefile
* @return
*/
- public List<ContributionImport> getImports();
+ List<ContributionImport> getImports();
/**
* Get a list of deployables for the contribution
* This is based on the contribution medatata sidefile, or all Composites available on the contribution
* @return
*/
- public List<Composite> getDeployables();
+ List<Composite> getDeployables();
/**
* Add an deployedArtifact to the contribution
* @param artifact
*/
- public void addArtifact(DeployedArtifact artifact);
+ void addArtifact(DeployedArtifact artifact);
/**
* Get a list of artifacts from the contribution
* @return
*/
- public Map<URI, DeployedArtifact> getArtifacts();
+ Map<URI, DeployedArtifact> getArtifacts();
/**
* Get a deployed artifact based on it's URI
* @param uri
* @return
*/
- public DeployedArtifact getArtifact(URI uri);
+ DeployedArtifact getArtifact(URI uri);
}
Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/ContributionImport.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/ContributionImport.java?view=diff&rev=534672&r1=534671&r2=534672
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/ContributionImport.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/ContributionImport.java Wed May 2 18:16:29 2007
@@ -26,29 +26,29 @@
*
* @version $Rev$ $Date$
*/
-public interface ContributionImport{
+public interface ContributionImport {
// TODO: We might need the field to point to the imported artifact/model
/**
*
* @return
*/
- public URI getLocation();
+ URI getLocation();
/**
* @param location
*/
- public void setLocation(URI location);
+ void setLocation(URI location);
/**
* Get Namespace that identifies the import
* @return
*/
- public String getNamespace();
+ String getNamespace();
/**
* Set Namespace that identifies the import
* @param namespace
*/
- public void setNamespace(String namespace);
+ void setNamespace(String namespace);
}
Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/DeployedArtifact.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/DeployedArtifact.java?view=diff&rev=534672&r1=534671&r2=534672
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/DeployedArtifact.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/DeployedArtifact.java Wed May 2 18:16:29 2007
@@ -25,29 +25,29 @@
*
* @version $Rev$ $Date$
*/
-public interface DeployedArtifact extends Artifact{
+public interface DeployedArtifact extends Artifact {
/**
* Get the contribution that this artifact belongs to
* @return
*/
- public Contribution getContribution();
+ Contribution getContribution();
/**
* Set te contribution that this artifact belongs to
* @param contribution
*/
- public void setContribution(Contribution contribution);
+ void setContribution(Contribution contribution);
/**
* Get the Assembly Model Object associated with this artifact
* @return
*/
- public Object getModelObject();
+ Object getModelObject();
/**
* Set the Assembly Model Object associated with this artifact
* @param modelObject
*/
- public void setModelObject(Object modelObject);
+ void setModelObject(Object modelObject);
}
Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/ArtifactProcessorExtensionPoint.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/ArtifactProcessorExtensionPoint.java?view=diff&rev=534672&r1=534671&r2=534672
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/ArtifactProcessorExtensionPoint.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/ArtifactProcessorExtensionPoint.java Wed May 2 18:16:29 2007
@@ -18,26 +18,25 @@
*/
package org.apache.tuscany.contribution.processor;
-
-
/**
* An extension point for artifact processors.
*
* @version $Rev$ $Date$
*/
public interface ArtifactProcessorExtensionPoint<P> {
-
+
/**
* Add an artifact processor.
+ *
* @param artifactProcessor the artifact processor to add
*/
void addExtension(P artifactProcessor);
-
+
/**
* Remove an artifact processor.
+ *
* @param artifactProcessor the artifact processor to remove
*/
-
- void removeExtension(P artifactProcessor);
+ void removeExtension(P artifactProcessor);
}
Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/DefaultArtifactProcessorExtensionPoint.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/DefaultArtifactProcessorExtensionPoint.java?view=diff&rev=534672&r1=534671&r2=534672
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/DefaultArtifactProcessorExtensionPoint.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/DefaultArtifactProcessorExtensionPoint.java Wed May 2 18:16:29 2007
@@ -28,8 +28,10 @@
* @version $Rev$ $Date$
*/
abstract class DefaultArtifactProcessorExtensionPoint {
- protected final Map<Object, ArtifactProcessorExtension> processorsByArtifactType = new HashMap<Object, ArtifactProcessorExtension>();
- protected final Map<Class<?>, ArtifactProcessorExtension> processorsByModelType = new HashMap<Class<?>, ArtifactProcessorExtension>();
+ protected final Map<Object, ArtifactProcessorExtension> processorsByArtifactType =
+ new HashMap<Object, ArtifactProcessorExtension>();
+ protected final Map<Class<?>, ArtifactProcessorExtension> processorsByModelType =
+ new HashMap<Class<?>, ArtifactProcessorExtension>();
/**
* Constructs a new loader registry.
@@ -53,10 +55,11 @@
*/
protected ArtifactProcessorExtension getProcessor(Class<?> modelType) {
Class<?>[] classes = modelType.getInterfaces();
- for (Class<?> c: classes) {
+ for (Class<?> c : classes) {
ArtifactProcessorExtension processor = processorsByModelType.get(c);
- if (processor != null)
+ if (processor != null) {
return processor;
+ }
}
return processorsByModelType.get(modelType);
}
Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java?view=diff&rev=534672&r1=534671&r2=534672
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java Wed May 2 18:16:29 2007
@@ -59,7 +59,7 @@
super();
this.inputFactory = inputFactory;
this.outputFactory = outputFactory;
- this.outputFactory.setProperty("javax.xml.stream.isRepairingNamespaces",Boolean.TRUE);
+ this.outputFactory.setProperty("javax.xml.stream.isRepairingNamespaces", Boolean.TRUE);
}
public DefaultStAXArtifactProcessorExtensionPoint() {
@@ -81,7 +81,8 @@
// Delegate to the processor associated with the model type
if (model != null) {
- StAXArtifactProcessorExtension<Object> processor = (StAXArtifactProcessorExtension<Object>)this.getProcessor((Class<Object>)model.getClass());
+ StAXArtifactProcessorExtension<Object> processor =
+ (StAXArtifactProcessorExtension<Object>)this.getProcessor((Class<Object>)model.getClass());
if (processor != null) {
processor.write(model, outputSource);
}
@@ -92,7 +93,8 @@
// Delegate to the processor associated with the model type
if (model != null) {
- StAXArtifactProcessorExtension<Object> processor = (StAXArtifactProcessorExtension<Object>)this.getProcessor((Class<Object>)model.getClass());
+ StAXArtifactProcessorExtension<Object> processor =
+ (StAXArtifactProcessorExtension<Object>)this.getProcessor((Class<Object>)model.getClass());
if (processor != null) {
processor.resolve(model, resolver);
}
@@ -103,7 +105,8 @@
// Delegate to the processor associated with the model type
if (model != null) {
- StAXArtifactProcessorExtension<Object> processor = (StAXArtifactProcessorExtension<Object>)this.getProcessor((Class<Object>)model.getClass());
+ StAXArtifactProcessorExtension<Object> processor =
+ (StAXArtifactProcessorExtension<Object>)this.getProcessor((Class<Object>)model.getClass());
if (processor != null) {
processor.wire(model);
}
Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java?view=diff&rev=534672&r1=534671&r2=534672
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java Wed May 2 18:16:29 2007
@@ -53,7 +53,7 @@
String extension = sourceURL.getFile();
int extensionStart = extension.lastIndexOf('.');
//handle files without extension (e.g NOTICE)
- if(extensionStart > 0){
+ if (extensionStart > 0) {
extension = extension.substring(extensionStart);
processor = (URLArtifactProcessorExtension<Object>)this.getProcessor(extension);
}
@@ -67,7 +67,8 @@
// Delegate to the processor associated with the particular model type
if (model != null) {
- URLArtifactProcessorExtension<Object> processor = (URLArtifactProcessorExtension<Object>)this.getProcessor((Class<Object>)model.getClass());
+ URLArtifactProcessorExtension<Object> processor =
+ (URLArtifactProcessorExtension<Object>)this.getProcessor((Class<Object>)model.getClass());
if (processor != null) {
processor.write(model, outputSource);
}
@@ -80,7 +81,8 @@
// Delegate to the processor associated with the model type
if (model != null) {
- URLArtifactProcessorExtension<Object> processor = (URLArtifactProcessorExtension<Object>)this.getProcessor((Class<Object>)model.getClass());
+ URLArtifactProcessorExtension<Object> processor =
+ (URLArtifactProcessorExtension<Object>)this.getProcessor((Class<Object>)model.getClass());
if (processor != null) {
processor.resolve(model, resolver);
}
@@ -91,14 +93,16 @@
// Delegate to the processor associated with the model type
if (model != null) {
- URLArtifactProcessorExtension<Object> processor = (URLArtifactProcessorExtension<Object>)this.getProcessor((Class<Object>)model.getClass());
+ URLArtifactProcessorExtension<Object> processor =
+ (URLArtifactProcessorExtension<Object>)this.getProcessor((Class<Object>)model.getClass());
if (processor != null) {
processor.wire(model);
}
}
}
- public <MO> MO read(URL contributionURL, URI artifactURI, URL artifactUrl, Class<MO> type) throws ContributionReadException {
+ public <MO> MO read(URL contributionURL, URI artifactURI, URL artifactUrl, Class<MO> type)
+ throws ContributionReadException {
Object mo = read(contributionURL, artifactURI, artifactUrl);
if (type.isInstance(mo)) {
return type.cast(mo);
Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/StAXArtifactProcessorExtensionPoint.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/StAXArtifactProcessorExtensionPoint.java?view=diff&rev=534672&r1=534671&r2=534672
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/StAXArtifactProcessorExtensionPoint.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/StAXArtifactProcessorExtensionPoint.java Wed May 2 18:16:29 2007
@@ -18,13 +18,12 @@
*/
package org.apache.tuscany.contribution.processor;
-
-
/**
* A registry for DOM artifact processors.
*
* @version $Rev$ $Date$
*/
-public interface StAXArtifactProcessorExtensionPoint extends ArtifactProcessorExtensionPoint<StAXArtifactProcessorExtension> {
-
+public interface StAXArtifactProcessorExtensionPoint extends
+ ArtifactProcessorExtensionPoint<StAXArtifactProcessorExtension> {
+
}
Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/service/ContributionMetadataLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/service/ContributionMetadataLoader.java?view=diff&rev=534672&r1=534671&r2=534672
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/service/ContributionMetadataLoader.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/service/ContributionMetadataLoader.java Wed May 2 18:16:29 2007
@@ -32,5 +32,5 @@
* @throws XMLStreamException
* @throws ContributionMetadataReadException
*/
- public Contribution load(XMLStreamReader reader) throws XMLStreamException, ContributionMetadataLoaderException;
+ Contribution load(XMLStreamReader reader) throws XMLStreamException, ContributionMetadataLoaderException;
}
Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/service/ContributionMetadataLoaderException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/service/ContributionMetadataLoaderException.java?view=diff&rev=534672&r1=534671&r2=534672
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/service/ContributionMetadataLoaderException.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/service/ContributionMetadataLoaderException.java Wed May 2 18:16:29 2007
@@ -19,14 +19,7 @@
package org.apache.tuscany.contribution.service;
-import org.apache.tuscany.contribution.service.ContributionException;
-
-
public class ContributionMetadataLoaderException extends ContributionException {
-
- /**
- *
- */
private static final long serialVersionUID = 2442537028550702609L;
public ContributionMetadataLoaderException() {
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org