diff options
| author | ramkumar <ramkumar@13f79535-47bb-0310-9956-ffa450edef68> | 2008-11-26 10:53:06 +0000 |
|---|---|---|
| committer | ramkumar <ramkumar@13f79535-47bb-0310-9956-ffa450edef68> | 2008-11-26 10:53:06 +0000 |
| commit | 7ac90896b8149bb6ba09a5f631c7213af191d65f (patch) | |
| tree | 525e3eeb3455c96febfa2f06e290a601b5aecdc3 /branches | |
| parent | 7e3b571f1ba4a17a09070adab74e8f159841da7c (diff) | |
Fixes for TUSCANY-2690
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@720798 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'branches')
126 files changed, 1981 insertions, 2566 deletions
diff --git a/branches/sca-java-1.x/demos/load-balancing-webapp/pom.xml b/branches/sca-java-1.x/demos/load-balancing-webapp/pom.xml index 84e693e59e..daaed32001 100644 --- a/branches/sca-java-1.x/demos/load-balancing-webapp/pom.xml +++ b/branches/sca-java-1.x/demos/load-balancing-webapp/pom.xml @@ -53,7 +53,7 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-monitor-logging</artifactId> + <artifactId>tuscany-monitor</artifactId> <version>1.4-SNAPSHOT</version> </dependency> diff --git a/branches/sca-java-1.x/distribution/features/all/pom.xml b/branches/sca-java-1.x/distribution/features/all/pom.xml index e720a2e331..259ede252c 100644 --- a/branches/sca-java-1.x/distribution/features/all/pom.xml +++ b/branches/sca-java-1.x/distribution/features/all/pom.xml @@ -1,240 +1,239 @@ -<?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> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-distribution-features</artifactId> - <version>1.4-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <artifactId>tuscany-distribution-all</artifactId> - <name>Apache Tuscany SCA All-in-one Distribution</name> - <packaging>pom</packaging> - - <dependencies> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-distribution-core</artifactId> - <type>pom</type> - <version>1.4-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-distribution-ejava</artifactId> - <type>pom</type> - <version>1.4-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-distribution-manager</artifactId> - <type>pom</type> - <version>1.4-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-distribution-process</artifactId> - <type>pom</type> - <version>1.4-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-distribution-web20</artifactId> - <type>pom</type> - <version>1.4-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-distribution-webservice</artifactId> - <type>pom</type> - <version>1.4-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-maven-ant-generator</artifactId> - <type>pom</type> - <version>1.4-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-maven-java2wsdl</artifactId> - <type>pom</type> - <version>1.4-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-maven-wsdl2java</artifactId> - <type>pom</type> - <version>1.4-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-maven-incremental-build</artifactId> - <type>pom</type> - <version>1.4-SNAPSHOT</version> - </dependency> - - </dependencies> - - <profiles> - - <!-- Default build profile that can be used to build the distro packages --> - <profile> - <id>default</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>distribution-package</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptors> - <descriptor>src/main/assembly/bin.xml</descriptor> - <descriptor>src/main/assembly/src.xml</descriptor> - </descriptors> - <tarLongFileMode>gnu</tarLongFileMode> - <finalName>apache-tuscany-sca-all-1.4-SNAPSHOT</finalName> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - - <!-- Profile that can be used to build the modules included in the distro --> - <profile> - <id>modules</id> - <modules> - <module>../../../modules/assembly</module> - <module>../../../modules/assembly-xml</module> - <module>../../../modules/assembly-xsd</module> - <module>../../../modules/binding-atom</module> - <module>../../../modules/binding-atom-abdera</module> - <module>../../../modules/binding-corba</module> - <module>../../../modules/binding-corba-runtime</module> - <module>../../../modules/binding-ejb</module> - <module>../../../modules/binding-ejb-runtime</module> - <module>../../../modules/binding-http</module> - <module>../../../modules/binding-http-runtime</module> - <module>../../../modules/binding-jms</module> - <module>../../../modules/binding-jms-runtime</module> - <module>../../../modules/binding-jsonrpc</module> - <module>../../../modules/binding-jsonrpc-runtime</module> - <module>../../../modules/binding-rss</module> - <module>../../../modules/binding-rss-rome</module> - <module>../../../modules/binding-sca</module> - <module>../../../modules/binding-sca-axis2</module> - <module>../../../modules/binding-sca-xml</module> - <module>../../../modules/binding-ws</module> - <module>../../../modules/binding-ws-axis2</module> - <module>../../../modules/binding-ws-wsdlgen</module> - <module>../../../modules/binding-ws-xml</module> - <module>../../../modules/contribution</module> - <module>../../../modules/contribution-impl</module> - <module>../../../modules/contribution-java</module> - <module>../../../modules/contribution-namespace</module> - <module>../../../modules/contribution-resource</module> - <module>../../../modules/contribution-xml</module> - <module>../../../modules/core</module> - <module>../../../modules/core-databinding</module> - <module>../../../modules/core-spi</module> - <module>../../../modules/data-api</module> - <module>../../../modules/databinding</module> - <module>../../../modules/databinding-axiom</module> - <module>../../../modules/databinding-jaxb</module> - <module>../../../modules/databinding-jaxb-axiom</module> - <module>../../../modules/databinding-json</module> - <module>../../../modules/databinding-saxon</module> - <module>../../../modules/databinding-sdo</module> - <module>../../../modules/databinding-sdo-axiom</module> - <module>../../../modules/definitions</module> - <module>../../../modules/definitions-xml</module> - <module>../../../modules/domain-manager</module> - <module>../../../modules/endpoint</module> - <module>../../../modules/extensibility</module> - <module>../../../modules/extensibility-equinox</module> - <module>../../../modules/extension-helper</module> - <module>../../../modules/host-corba</module> - <module>../../../modules/host-corba-jse</module> - <module>../../../modules/host-ejb</module> - <module>../../../modules/host-embedded</module> - <module>../../../modules/host-http</module> - <module>../../../modules/host-jetty</module> - <module>../../../modules/implementation-bpel</module> - <module>../../../modules/implementation-bpel-ode</module> - <module>../../../modules/implementation-ejb</module> - <module>../../../modules/implementation-java</module> - <module>../../../modules/implementation-java-runtime</module> - <module>../../../modules/implementation-java-xml</module> - <module>../../../modules/implementation-node</module> - <module>../../../modules/implementation-node-runtime</module> - <module>../../../modules/implementation-resource</module> - <module>../../../modules/implementation-resource-runtime</module> - <module>../../../modules/implementation-script</module> - <module>../../../modules/implementation-spring</module> - <module>../../../modules/implementation-widget</module> - <module>../../../modules/implementation-widget-runtime</module> - <module>../../../modules/implementation-xquery</module> - <module>../../../modules/interface</module> - <module>../../../modules/interface-java</module> - <module>../../../modules/interface-java-jaxws</module> - <module>../../../modules/interface-java-xml</module> - <module>../../../modules/interface-wsdl</module> - <module>../../../modules/interface-wsdl-xml</module> - <module>../../../modules/monitor</module> - <module>../../../modules/monitor-logging</module> - <module>../../../modules/node-api</module> - <module>../../../modules/node-impl</module> - <module>../../../modules/node-launcher</module> - <module>../../../modules/node-launcher-equinox</module> - <module>../../../modules/node-launcher-webapp</module> - <module>../../../modules/node-manager</module> - <module>../../../modules/policy</module> - <module>../../../modules/policy-security</module> - <module>../../../modules/policy-security-ws</module> - <module>../../../modules/policy-xml</module> - <module>../../../modules/policy-xml-ws</module> - <module>../../../modules/sca-api</module> - <module>../../../modules/workspace</module> - <module>../../../modules/workspace-impl</module> - <module>../../../modules/workspace-xml</module> - <module>../../../modules/xsd</module> - <module>../../../modules/xsd-xml</module> - </modules> - </profile> - </profiles> - -</project> +<?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>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-distribution-features</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>tuscany-distribution-all</artifactId>
+ <name>Apache Tuscany SCA All-in-one Distribution</name>
+ <packaging>pom</packaging>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-distribution-core</artifactId>
+ <type>pom</type>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-distribution-ejava</artifactId>
+ <type>pom</type>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-distribution-manager</artifactId>
+ <type>pom</type>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-distribution-process</artifactId>
+ <type>pom</type>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-distribution-web20</artifactId>
+ <type>pom</type>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-distribution-webservice</artifactId>
+ <type>pom</type>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-maven-ant-generator</artifactId>
+ <type>pom</type>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-maven-java2wsdl</artifactId>
+ <type>pom</type>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-maven-wsdl2java</artifactId>
+ <type>pom</type>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-maven-incremental-build</artifactId>
+ <type>pom</type>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+
+ </dependencies>
+
+ <profiles>
+
+ <!-- Default build profile that can be used to build the distro packages -->
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>distribution-package</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/bin.xml</descriptor>
+ <descriptor>src/main/assembly/src.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ <finalName>apache-tuscany-sca-all-1.4-SNAPSHOT</finalName>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!-- Profile that can be used to build the modules included in the distro -->
+ <profile>
+ <id>modules</id>
+ <modules>
+ <module>../../../modules/assembly</module>
+ <module>../../../modules/assembly-xml</module>
+ <module>../../../modules/assembly-xsd</module>
+ <module>../../../modules/binding-atom</module>
+ <module>../../../modules/binding-atom-abdera</module>
+ <module>../../../modules/binding-corba</module>
+ <module>../../../modules/binding-corba-runtime</module>
+ <module>../../../modules/binding-ejb</module>
+ <module>../../../modules/binding-ejb-runtime</module>
+ <module>../../../modules/binding-http</module>
+ <module>../../../modules/binding-http-runtime</module>
+ <module>../../../modules/binding-jms</module>
+ <module>../../../modules/binding-jms-runtime</module>
+ <module>../../../modules/binding-jsonrpc</module>
+ <module>../../../modules/binding-jsonrpc-runtime</module>
+ <module>../../../modules/binding-rss</module>
+ <module>../../../modules/binding-rss-rome</module>
+ <module>../../../modules/binding-sca</module>
+ <module>../../../modules/binding-sca-axis2</module>
+ <module>../../../modules/binding-sca-xml</module>
+ <module>../../../modules/binding-ws</module>
+ <module>../../../modules/binding-ws-axis2</module>
+ <module>../../../modules/binding-ws-wsdlgen</module>
+ <module>../../../modules/binding-ws-xml</module>
+ <module>../../../modules/contribution</module>
+ <module>../../../modules/contribution-impl</module>
+ <module>../../../modules/contribution-java</module>
+ <module>../../../modules/contribution-namespace</module>
+ <module>../../../modules/contribution-resource</module>
+ <module>../../../modules/contribution-xml</module>
+ <module>../../../modules/core</module>
+ <module>../../../modules/core-databinding</module>
+ <module>../../../modules/core-spi</module>
+ <module>../../../modules/data-api</module>
+ <module>../../../modules/databinding</module>
+ <module>../../../modules/databinding-axiom</module>
+ <module>../../../modules/databinding-jaxb</module>
+ <module>../../../modules/databinding-jaxb-axiom</module>
+ <module>../../../modules/databinding-json</module>
+ <module>../../../modules/databinding-saxon</module>
+ <module>../../../modules/databinding-sdo</module>
+ <module>../../../modules/databinding-sdo-axiom</module>
+ <module>../../../modules/definitions</module>
+ <module>../../../modules/definitions-xml</module>
+ <module>../../../modules/domain-manager</module>
+ <module>../../../modules/endpoint</module>
+ <module>../../../modules/extensibility</module>
+ <module>../../../modules/extensibility-equinox</module>
+ <module>../../../modules/extension-helper</module>
+ <module>../../../modules/host-corba</module>
+ <module>../../../modules/host-corba-jse</module>
+ <module>../../../modules/host-ejb</module>
+ <module>../../../modules/host-embedded</module>
+ <module>../../../modules/host-http</module>
+ <module>../../../modules/host-jetty</module>
+ <module>../../../modules/implementation-bpel</module>
+ <module>../../../modules/implementation-bpel-ode</module>
+ <module>../../../modules/implementation-ejb</module>
+ <module>../../../modules/implementation-java</module>
+ <module>../../../modules/implementation-java-runtime</module>
+ <module>../../../modules/implementation-java-xml</module>
+ <module>../../../modules/implementation-node</module>
+ <module>../../../modules/implementation-node-runtime</module>
+ <module>../../../modules/implementation-resource</module>
+ <module>../../../modules/implementation-resource-runtime</module>
+ <module>../../../modules/implementation-script</module>
+ <module>../../../modules/implementation-spring</module>
+ <module>../../../modules/implementation-widget</module>
+ <module>../../../modules/implementation-widget-runtime</module>
+ <module>../../../modules/implementation-xquery</module>
+ <module>../../../modules/interface</module>
+ <module>../../../modules/interface-java</module>
+ <module>../../../modules/interface-java-jaxws</module>
+ <module>../../../modules/interface-java-xml</module>
+ <module>../../../modules/interface-wsdl</module>
+ <module>../../../modules/interface-wsdl-xml</module>
+ <module>../../../modules/monitor</module>
+ <module>../../../modules/node-api</module>
+ <module>../../../modules/node-impl</module>
+ <module>../../../modules/node-launcher</module>
+ <module>../../../modules/node-launcher-equinox</module>
+ <module>../../../modules/node-launcher-webapp</module>
+ <module>../../../modules/node-manager</module>
+ <module>../../../modules/policy</module>
+ <module>../../../modules/policy-security</module>
+ <module>../../../modules/policy-security-ws</module>
+ <module>../../../modules/policy-xml</module>
+ <module>../../../modules/policy-xml-ws</module>
+ <module>../../../modules/sca-api</module>
+ <module>../../../modules/workspace</module>
+ <module>../../../modules/workspace-impl</module>
+ <module>../../../modules/workspace-xml</module>
+ <module>../../../modules/xsd</module>
+ <module>../../../modules/xsd-xml</module>
+ </modules>
+ </profile>
+ </profiles>
+
+</project>
diff --git a/branches/sca-java-1.x/distribution/features/core/pom.xml b/branches/sca-java-1.x/distribution/features/core/pom.xml index 53f01acf49..0904a70f3e 100644 --- a/branches/sca-java-1.x/distribution/features/core/pom.xml +++ b/branches/sca-java-1.x/distribution/features/core/pom.xml @@ -1,340 +1,334 @@ -<?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> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-distribution-features</artifactId> - <version>1.4-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <artifactId>tuscany-distribution-core</artifactId> - <name>Apache Tuscany SCA Core Distribution</name> - <packaging>pom</packaging> - - <dependencies> - - <!-- Assembly model --> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-assembly-xml</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-assembly-xsd</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - - <!-- Corba binding --> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-corba-runtime</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - - <!-- Contribution model --> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-contribution-impl</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-contribution-java</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-contribution-namespace</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - - <!-- Core runtime --> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-core</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-core-databinding</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-core-spi</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - - <!-- Databindings --> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-databinding</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-databinding-jaxb</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - - <!-- Data API --> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-data-api</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - - <!-- Policy definitions --> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-definitions-xml</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - - <!-- Domain support --> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-endpoint</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - - <!-- Core Extensibility --> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-extensibility</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-extensibility-equinox</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - - <!-- Corba host --> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-corba-jse</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - - <!-- Implementation types --> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-node-runtime</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - - <!-- Interface models --> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-interface-java-xml</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-interface-java-jaxws</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-interface-wsdl-xml</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - - <!-- Node runtime --> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-api</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-launcher</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-launcher-equinox</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-launcher-webapp</artifactId> - <version>1.4-SNAPSHOT</version> - <type>war</type> - </dependency> - - <!-- Monitoring --> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-monitor</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-monitor-logging</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - - <!-- Policy models --> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-policy</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-policy-security</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-policy-xml</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - - <!-- SCA API --> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-sca-api</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - - <!-- XMLSchema support --> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-xsd</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-xsd-xml</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - </dependencies> - - <profiles> - - <!-- Default build profile that can be used to build the distro packages --> - <profile> - <id>default</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>distribution-package</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptors> - <descriptor>src/main/assembly/bin.xml</descriptor> - <descriptor>src/main/assembly/src.xml</descriptor> - </descriptors> - <tarLongFileMode>gnu</tarLongFileMode> - <finalName>apache-tuscany-sca-1.4-SNAPSHOT</finalName> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - - <!-- Profile that can be used to build the modules included in the distro --> - <profile> - <id>modules</id> - <modules> - <module>../../../modules/assembly</module> - <module>../../../modules/assembly-xml</module> - <module>../../../modules/assembly-xsd</module> - <module>../../../modules/binding-corba</module> - <module>../../../modules/binding-corba-runtime</module> - <module>../../../modules/binding-sca</module> - <module>../../../modules/binding-sca-xml</module> - <module>../../../modules/contribution</module> - <module>../../../modules/contribution-impl</module> - <module>../../../modules/contribution-java</module> - <module>../../../modules/contribution-namespace</module> - <module>../../../modules/contribution-xml</module> - <module>../../../modules/core</module> - <module>../../../modules/core-databinding</module> - <module>../../../modules/core-spi</module> - <module>../../../modules/data-api</module> - <module>../../../modules/databinding</module> - <module>../../../modules/databinding-jaxb</module> - <module>../../../modules/definitions</module> - <module>../../../modules/definitions-xml</module> - <module>../../../modules/endpoint</module> - <module>../../../modules/extensibility</module> - <module>../../../modules/extensibility-equinox</module> - <module>../../../modules/host-corba</module> - <module>../../../modules/host-corba-jse</module> - <module>../../../modules/host-embedded</module> - <module>../../../modules/host-http</module> - <module>../../../modules/implementation-java</module> - <module>../../../modules/implementation-java-runtime</module> - <module>../../../modules/implementation-java-xml</module> - <module>../../../modules/implementation-node</module> - <module>../../../modules/implementation-node-runtime</module> - <module>../../../modules/interface</module> - <module>../../../modules/interface-java</module> - <module>../../../modules/interface-java-jaxws</module> - <module>../../../modules/interface-java-xml</module> - <module>../../../modules/interface-wsdl</module> - <module>../../../modules/interface-wsdl-xml</module> - <module>../../../modules/monitor</module> - <module>../../../modules/monitor-logging</module> - <module>../../../modules/node-api</module> - <module>../../../modules/node-impl</module> - <module>../../../modules/node-launcher</module> - <module>../../../modules/node-launcher-equinox</module> - <module>../../../modules/node-launcher-webapp</module> - <module>../../../modules/policy</module> - <module>../../../modules/policy-security</module> - <module>../../../modules/policy-xml</module> - <module>../../../modules/sca-api</module> - <module>../../../modules/xsd</module> - <module>../../../modules/xsd-xml</module> - </modules> - </profile> - </profiles> - -</project> +<?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>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-distribution-features</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>tuscany-distribution-core</artifactId>
+ <name>Apache Tuscany SCA Core Distribution</name>
+ <packaging>pom</packaging>
+
+ <dependencies>
+
+ <!-- Assembly model -->
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-assembly-xml</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-assembly-xsd</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+
+ <!-- Corba binding -->
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-binding-corba-runtime</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+
+ <!-- Contribution model -->
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-contribution-impl</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-contribution-java</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-contribution-namespace</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+
+ <!-- Core runtime -->
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-core</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-core-databinding</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-core-spi</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+
+ <!-- Databindings -->
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-databinding</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-databinding-jaxb</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+
+ <!-- Data API -->
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-data-api</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+
+ <!-- Policy definitions -->
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-definitions-xml</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+
+ <!-- Domain support -->
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-endpoint</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+
+ <!-- Core Extensibility -->
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-extensibility</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-extensibility-equinox</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+
+ <!-- Corba host -->
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-host-corba-jse</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+
+ <!-- Implementation types -->
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-implementation-java-runtime</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-implementation-node-runtime</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+
+ <!-- Interface models -->
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-interface-java-xml</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-interface-java-jaxws</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-interface-wsdl-xml</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+
+ <!-- Node runtime -->
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-node-api</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-node-impl</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-node-launcher</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-node-launcher-equinox</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-node-launcher-webapp</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ <type>war</type>
+ </dependency>
+
+ <!-- Monitoring -->
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-monitor</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+
+ <!-- Policy models -->
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-policy</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-policy-security</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-policy-xml</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+
+ <!-- SCA API -->
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-sca-api</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+
+ <!-- XMLSchema support -->
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-xsd</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-xsd-xml</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
+ <profiles>
+
+ <!-- Default build profile that can be used to build the distro packages -->
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>distribution-package</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/bin.xml</descriptor>
+ <descriptor>src/main/assembly/src.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ <finalName>apache-tuscany-sca-1.4-SNAPSHOT</finalName>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!-- Profile that can be used to build the modules included in the distro -->
+ <profile>
+ <id>modules</id>
+ <modules>
+ <module>../../../modules/assembly</module>
+ <module>../../../modules/assembly-xml</module>
+ <module>../../../modules/assembly-xsd</module>
+ <module>../../../modules/binding-corba</module>
+ <module>../../../modules/binding-corba-runtime</module>
+ <module>../../../modules/binding-sca</module>
+ <module>../../../modules/binding-sca-xml</module>
+ <module>../../../modules/contribution</module>
+ <module>../../../modules/contribution-impl</module>
+ <module>../../../modules/contribution-java</module>
+ <module>../../../modules/contribution-namespace</module>
+ <module>../../../modules/contribution-xml</module>
+ <module>../../../modules/core</module>
+ <module>../../../modules/core-databinding</module>
+ <module>../../../modules/core-spi</module>
+ <module>../../../modules/data-api</module>
+ <module>../../../modules/databinding</module>
+ <module>../../../modules/databinding-jaxb</module>
+ <module>../../../modules/definitions</module>
+ <module>../../../modules/definitions-xml</module>
+ <module>../../../modules/endpoint</module>
+ <module>../../../modules/extensibility</module>
+ <module>../../../modules/extensibility-equinox</module>
+ <module>../../../modules/host-corba</module>
+ <module>../../../modules/host-corba-jse</module>
+ <module>../../../modules/host-embedded</module>
+ <module>../../../modules/host-http</module>
+ <module>../../../modules/implementation-java</module>
+ <module>../../../modules/implementation-java-runtime</module>
+ <module>../../../modules/implementation-java-xml</module>
+ <module>../../../modules/implementation-node</module>
+ <module>../../../modules/implementation-node-runtime</module>
+ <module>../../../modules/interface</module>
+ <module>../../../modules/interface-java</module>
+ <module>../../../modules/interface-java-jaxws</module>
+ <module>../../../modules/interface-java-xml</module>
+ <module>../../../modules/interface-wsdl</module>
+ <module>../../../modules/interface-wsdl-xml</module>
+ <module>../../../modules/monitor</module>
+ <module>../../../modules/node-api</module>
+ <module>../../../modules/node-impl</module>
+ <module>../../../modules/node-launcher</module>
+ <module>../../../modules/node-launcher-equinox</module>
+ <module>../../../modules/node-launcher-webapp</module>
+ <module>../../../modules/policy</module>
+ <module>../../../modules/policy-security</module>
+ <module>../../../modules/policy-xml</module>
+ <module>../../../modules/sca-api</module>
+ <module>../../../modules/xsd</module>
+ <module>../../../modules/xsd-xml</module>
+ </modules>
+ </profile>
+ </profiles>
+
+</project>
diff --git a/branches/sca-java-1.x/distribution/features/ejava/pom.xml b/branches/sca-java-1.x/distribution/features/ejava/pom.xml index 1ff6baa336..84ee7c1bcc 100644 --- a/branches/sca-java-1.x/distribution/features/ejava/pom.xml +++ b/branches/sca-java-1.x/distribution/features/ejava/pom.xml @@ -1,179 +1,178 @@ -<?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> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-distribution-features</artifactId> - <version>1.4-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <artifactId>tuscany-distribution-ejava</artifactId> - <name>Apache Tuscany SCA JEE Distribution</name> - <packaging>pom</packaging> - - <dependencies> - - <!-- Core distribution --> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-distribution-core</artifactId> - <type>pom</type> - <version>1.4-SNAPSHOT</version> - </dependency> - - <!-- Bindings --> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ejb-runtime</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-jms-runtime</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - - <!-- Hosts --> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-ejb</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - - <!-- Implementations --> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-ejb</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-spring</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - </dependencies> - - <profiles> - - <!-- Default build profile that can be used to build the distro packages --> - <profile> - <id>default</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>distribution-package</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptors> - <descriptor>src/main/assembly/bin.xml</descriptor> - <descriptor>src/main/assembly/src.xml</descriptor> - </descriptors> - <tarLongFileMode>gnu</tarLongFileMode> - <finalName>apache-tuscany-sca-ejava-1.4-SNAPSHOT</finalName> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - - <!-- Profile that can be used to build the modules included in the distro --> - <profile> - <id>modules</id> - <modules> - <module>../../../modules/assembly</module> - <module>../../../modules/assembly-xml</module> - <module>../../../modules/assembly-xsd</module> - <module>../../../modules/binding-corba</module> - <module>../../../modules/binding-corba-runtime</module> - <module>../../../modules/binding-ejb</module> - <module>../../../modules/binding-ejb-runtime</module> - <module>../../../modules/binding-jms</module> - <module>../../../modules/binding-jms-runtime</module> - <module>../../../modules/binding-sca</module> - <module>../../../modules/binding-sca-xml</module> - <module>../../../modules/contribution</module> - <module>../../../modules/contribution-impl</module> - <module>../../../modules/contribution-java</module> - <module>../../../modules/contribution-namespace</module> - <module>../../../modules/contribution-xml</module> - <module>../../../modules/core</module> - <module>../../../modules/core-databinding</module> - <module>../../../modules/core-spi</module> - <module>../../../modules/data-api</module> - <module>../../../modules/databinding</module> - <module>../../../modules/databinding-axiom</module> - <module>../../../modules/databinding-jaxb</module> - <module>../../../modules/definitions</module> - <module>../../../modules/definitions-xml</module> - <module>../../../modules/endpoint</module> - <module>../../../modules/extensibility</module> - <module>../../../modules/extensibility-equinox</module> - <module>../../../modules/extension-helper</module> - <module>../../../modules/host-corba</module> - <module>../../../modules/host-corba-jse</module> - <module>../../../modules/host-ejb</module> - <module>../../../modules/host-embedded</module> - <module>../../../modules/host-http</module> - <module>../../../modules/implementation-ejb</module> - <module>../../../modules/implementation-java</module> - <module>../../../modules/implementation-java-runtime</module> - <module>../../../modules/implementation-java-xml</module> - <module>../../../modules/implementation-node</module> - <module>../../../modules/implementation-node-runtime</module> - <module>../../../modules/implementation-script</module> - <module>../../../modules/implementation-spring</module> - <module>../../../modules/interface</module> - <module>../../../modules/interface-java</module> - <module>../../../modules/interface-java-jaxws</module> - <module>../../../modules/interface-java-xml</module> - <module>../../../modules/interface-wsdl</module> - <module>../../../modules/interface-wsdl-xml</module> - <module>../../../modules/monitor</module> - <module>../../../modules/monitor-logging</module> - <module>../../../modules/node-api</module> - <module>../../../modules/node-impl</module> - <module>../../../modules/node-launcher</module> - <module>../../../modules/node-launcher-equinox</module> - <module>../../../modules/node-launcher-webapp</module> - <module>../../../modules/policy</module> - <module>../../../modules/policy-security</module> - <module>../../../modules/policy-xml</module> - <module>../../../modules/sca-api</module> - <module>../../../modules/xsd</module> - <module>../../../modules/xsd-xml</module> - </modules> - </profile> - </profiles> - -</project> +<?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>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-distribution-features</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>tuscany-distribution-ejava</artifactId>
+ <name>Apache Tuscany SCA JEE Distribution</name>
+ <packaging>pom</packaging>
+
+ <dependencies>
+
+ <!-- Core distribution -->
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-distribution-core</artifactId>
+ <type>pom</type>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+
+ <!-- Bindings -->
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-binding-ejb-runtime</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-binding-jms-runtime</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+
+ <!-- Hosts -->
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-host-ejb</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+
+ <!-- Implementations -->
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-implementation-ejb</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-implementation-spring</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
+ <profiles>
+
+ <!-- Default build profile that can be used to build the distro packages -->
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>distribution-package</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/bin.xml</descriptor>
+ <descriptor>src/main/assembly/src.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ <finalName>apache-tuscany-sca-ejava-1.4-SNAPSHOT</finalName>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!-- Profile that can be used to build the modules included in the distro -->
+ <profile>
+ <id>modules</id>
+ <modules>
+ <module>../../../modules/assembly</module>
+ <module>../../../modules/assembly-xml</module>
+ <module>../../../modules/assembly-xsd</module>
+ <module>../../../modules/binding-corba</module>
+ <module>../../../modules/binding-corba-runtime</module>
+ <module>../../../modules/binding-ejb</module>
+ <module>../../../modules/binding-ejb-runtime</module>
+ <module>../../../modules/binding-jms</module>
+ <module>../../../modules/binding-jms-runtime</module>
+ <module>../../../modules/binding-sca</module>
+ <module>../../../modules/binding-sca-xml</module>
+ <module>../../../modules/contribution</module>
+ <module>../../../modules/contribution-impl</module>
+ <module>../../../modules/contribution-java</module>
+ <module>../../../modules/contribution-namespace</module>
+ <module>../../../modules/contribution-xml</module>
+ <module>../../../modules/core</module>
+ <module>../../../modules/core-databinding</module>
+ <module>../../../modules/core-spi</module>
+ <module>../../../modules/data-api</module>
+ <module>../../../modules/databinding</module>
+ <module>../../../modules/databinding-axiom</module>
+ <module>../../../modules/databinding-jaxb</module>
+ <module>../../../modules/definitions</module>
+ <module>../../../modules/definitions-xml</module>
+ <module>../../../modules/endpoint</module>
+ <module>../../../modules/extensibility</module>
+ <module>../../../modules/extensibility-equinox</module>
+ <module>../../../modules/extension-helper</module>
+ <module>../../../modules/host-corba</module>
+ <module>../../../modules/host-corba-jse</module>
+ <module>../../../modules/host-ejb</module>
+ <module>../../../modules/host-embedded</module>
+ <module>../../../modules/host-http</module>
+ <module>../../../modules/implementation-ejb</module>
+ <module>../../../modules/implementation-java</module>
+ <module>../../../modules/implementation-java-runtime</module>
+ <module>../../../modules/implementation-java-xml</module>
+ <module>../../../modules/implementation-node</module>
+ <module>../../../modules/implementation-node-runtime</module>
+ <module>../../../modules/implementation-script</module>
+ <module>../../../modules/implementation-spring</module>
+ <module>../../../modules/interface</module>
+ <module>../../../modules/interface-java</module>
+ <module>../../../modules/interface-java-jaxws</module>
+ <module>../../../modules/interface-java-xml</module>
+ <module>../../../modules/interface-wsdl</module>
+ <module>../../../modules/interface-wsdl-xml</module>
+ <module>../../../modules/monitor</module>
+ <module>../../../modules/node-api</module>
+ <module>../../../modules/node-impl</module>
+ <module>../../../modules/node-launcher</module>
+ <module>../../../modules/node-launcher-equinox</module>
+ <module>../../../modules/node-launcher-webapp</module>
+ <module>../../../modules/policy</module>
+ <module>../../../modules/policy-security</module>
+ <module>../../../modules/policy-xml</module>
+ <module>../../../modules/sca-api</module>
+ <module>../../../modules/xsd</module>
+ <module>../../../modules/xsd-xml</module>
+ </modules>
+ </profile>
+ </profiles>
+
+</project>
diff --git a/branches/sca-java-1.x/distribution/features/manager/pom.xml b/branches/sca-java-1.x/distribution/features/manager/pom.xml index cc594256c9..3463595fc6 100644 --- a/branches/sca-java-1.x/distribution/features/manager/pom.xml +++ b/branches/sca-java-1.x/distribution/features/manager/pom.xml @@ -1,259 +1,258 @@ -<?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> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-distribution-features</artifactId> - <version>1.4-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <artifactId>tuscany-distribution-manager</artifactId> - <name>Apache Tuscany SCA Domain Manager Distribution</name> - <packaging>pom</packaging> - - <dependencies> - - <!-- Core distribution --> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-distribution-core</artifactId> - <type>pom</type> - <version>1.4-SNAPSHOT</version> - </dependency> - - <!-- Binding Models --> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-atom</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ejb</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-http</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-jsonrpc</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-rss</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-sca-xml</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-xml</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - - <!-- Contribution models --> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-contribution-java</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-contribution-namespace</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-contribution-resource</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - - <!-- Domain support --> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-domain-manager</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-manager</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - - <!-- Implementation Models --> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-bpel</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-ejb</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-xml</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-node</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-resource</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-widget</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - </dependencies> - - <profiles> - - <!-- Default build profile that can be used to build the distro packages --> - <profile> - <id>default</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>distribution-package</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptors> - <descriptor>src/main/assembly/bin.xml</descriptor> - <descriptor>src/main/assembly/src.xml</descriptor> - </descriptors> - <tarLongFileMode>gnu</tarLongFileMode> - <finalName>apache-tuscany-sca-manager-1.4-SNAPSHOT</finalName> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - - <!-- Profile that can be used to build the modules included in the distro --> - <profile> - <id>modules</id> - <modules> - <module>../../../modules/assembly</module> - <module>../../../modules/assembly-xml</module> - <module>../../../modules/assembly-xsd</module> - <module>../../../modules/binding-atom</module> - <module>../../../modules/binding-atom-abdera</module> - <module>../../../modules/binding-corba</module> - <module>../../../modules/binding-corba-runtime</module> - <module>../../../modules/binding-ejb</module> - <module>../../../modules/binding-http</module> - <module>../../../modules/binding-http-runtime</module> - <module>../../../modules/binding-jsonrpc</module> - <module>../../../modules/binding-rss</module> - <module>../../../modules/binding-sca</module> - <module>../../../modules/binding-sca-xml</module> - <module>../../../modules/binding-ws</module> - <module>../../../modules/binding-ws-wsdlgen</module> - <module>../../../modules/binding-ws-xml</module> - <module>../../../modules/contribution</module> - <module>../../../modules/contribution-impl</module> - <module>../../../modules/contribution-java</module> - <module>../../../modules/contribution-namespace</module> - <module>../../../modules/contribution-resource</module> - <module>../../../modules/contribution-xml</module> - <module>../../../modules/core</module> - <module>../../../modules/core-databinding</module> - <module>../../../modules/core-spi</module> - <module>../../../modules/data-api</module> - <module>../../../modules/databinding</module> - <module>../../../modules/databinding-jaxb</module> - <module>../../../modules/definitions</module> - <module>../../../modules/definitions-xml</module> - <module>../../../modules/domain-manager</module> - <module>../../../modules/endpoint</module> - <module>../../../modules/extensibility</module> - <module>../../../modules/extensibility-equinox</module> - <module>../../../modules/host-corba</module> - <module>../../../modules/host-corba-jse</module> - <module>../../../modules/host-embedded</module> - <module>../../../modules/host-http</module> - <module>../../../modules/host-jetty</module> - <module>../../../modules/implementation-bpel</module> - <module>../../../modules/implementation-ejb</module> - <module>../../../modules/implementation-java</module> - <module>../../../modules/implementation-java-runtime</module> - <module>../../../modules/implementation-java-xml</module> - <module>../../../modules/implementation-node</module> - <module>../../../modules/implementation-node-runtime</module> - <module>../../../modules/implementation-resource</module> - <module>../../../modules/implementation-widget</module> - <module>../../../modules/implementation-widget-runtime</module> - <module>../../../modules/interface</module> - <module>../../../modules/interface-java</module> - <module>../../../modules/interface-java-jaxws</module> - <module>../../../modules/interface-java-xml</module> - <module>../../../modules/interface-wsdl</module> - <module>../../../modules/interface-wsdl-xml</module> - <module>../../../modules/monitor</module> - <module>../../../modules/monitor-logging</module> - <module>../../../modules/node-api</module> - <module>../../../modules/node-impl</module> - <module>../../../modules/node-launcher</module> - <module>../../../modules/node-launcher-equinox</module> - <module>../../../modules/node-launcher-webapp</module> - <module>../../../modules/node-manager</module> - <module>../../../modules/policy</module> - <module>../../../modules/policy-security</module> - <module>../../../modules/policy-security-ws</module> - <module>../../../modules/policy-xml</module> - <module>../../../modules/sca-api</module> - <module>../../../modules/workspace</module> - <module>../../../modules/workspace-impl</module> - <module>../../../modules/workspace-xml</module> - <module>../../../modules/xsd</module> - <module>../../../modules/xsd-xml</module> - </modules> - </profile> - </profiles> - -</project> +<?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>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-distribution-features</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>tuscany-distribution-manager</artifactId>
+ <name>Apache Tuscany SCA Domain Manager Distribution</name>
+ <packaging>pom</packaging>
+
+ <dependencies>
+
+ <!-- Core distribution -->
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-distribution-core</artifactId>
+ <type>pom</type>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+
+ <!-- Binding Models -->
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-binding-atom</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-binding-ejb</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-binding-http</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-binding-jsonrpc</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-binding-rss</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-binding-sca-xml</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-binding-ws-xml</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+
+ <!-- Contribution models -->
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-contribution-java</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-contribution-namespace</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-contribution-resource</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+
+ <!-- Domain support -->
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-domain-manager</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-node-manager</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+
+ <!-- Implementation Models -->
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-implementation-bpel</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-implementation-ejb</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-implementation-java-xml</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-implementation-node</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-implementation-resource</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-implementation-widget</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
+ <profiles>
+
+ <!-- Default build profile that can be used to build the distro packages -->
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>distribution-package</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/bin.xml</descriptor>
+ <descriptor>src/main/assembly/src.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ <finalName>apache-tuscany-sca-manager-1.4-SNAPSHOT</finalName>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!-- Profile that can be used to build the modules included in the distro -->
+ <profile>
+ <id>modules</id>
+ <modules>
+ <module>../../../modules/assembly</module>
+ <module>../../../modules/assembly-xml</module>
+ <module>../../../modules/assembly-xsd</module>
+ <module>../../../modules/binding-atom</module>
+ <module>../../../modules/binding-atom-abdera</module>
+ <module>../../../modules/binding-corba</module>
+ <module>../../../modules/binding-corba-runtime</module>
+ <module>../../../modules/binding-ejb</module>
+ <module>../../../modules/binding-http</module>
+ <module>../../../modules/binding-http-runtime</module>
+ <module>../../../modules/binding-jsonrpc</module>
+ <module>../../../modules/binding-rss</module>
+ <module>../../../modules/binding-sca</module>
+ <module>../../../modules/binding-sca-xml</module>
+ <module>../../../modules/binding-ws</module>
+ <module>../../../modules/binding-ws-wsdlgen</module>
+ <module>../../../modules/binding-ws-xml</module>
+ <module>../../../modules/contribution</module>
+ <module>../../../modules/contribution-impl</module>
+ <module>../../../modules/contribution-java</module>
+ <module>../../../modules/contribution-namespace</module>
+ <module>../../../modules/contribution-resource</module>
+ <module>../../../modules/contribution-xml</module>
+ <module>../../../modules/core</module>
+ <module>../../../modules/core-databinding</module>
+ <module>../../../modules/core-spi</module>
+ <module>../../../modules/data-api</module>
+ <module>../../../modules/databinding</module>
+ <module>../../../modules/databinding-jaxb</module>
+ <module>../../../modules/definitions</module>
+ <module>../../../modules/definitions-xml</module>
+ <module>../../../modules/domain-manager</module>
+ <module>../../../modules/endpoint</module>
+ <module>../../../modules/extensibility</module>
+ <module>../../../modules/extensibility-equinox</module>
+ <module>../../../modules/host-corba</module>
+ <module>../../../modules/host-corba-jse</module>
+ <module>../../../modules/host-embedded</module>
+ <module>../../../modules/host-http</module>
+ <module>../../../modules/host-jetty</module>
+ <module>../../../modules/implementation-bpel</module>
+ <module>../../../modules/implementation-ejb</module>
+ <module>../../../modules/implementation-java</module>
+ <module>../../../modules/implementation-java-runtime</module>
+ <module>../../../modules/implementation-java-xml</module>
+ <module>../../../modules/implementation-node</module>
+ <module>../../../modules/implementation-node-runtime</module>
+ <module>../../../modules/implementation-resource</module>
+ <module>../../../modules/implementation-widget</module>
+ <module>../../../modules/implementation-widget-runtime</module>
+ <module>../../../modules/interface</module>
+ <module>../../../modules/interface-java</module>
+ <module>../../../modules/interface-java-jaxws</module>
+ <module>../../../modules/interface-java-xml</module>
+ <module>../../../modules/interface-wsdl</module>
+ <module>../../../modules/interface-wsdl-xml</module>
+ <module>../../../modules/monitor</module>
+ <module>../../../modules/node-api</module>
+ <module>../../../modules/node-impl</module>
+ <module>../../../modules/node-launcher</module>
+ <module>../../../modules/node-launcher-equinox</module>
+ <module>../../../modules/node-launcher-webapp</module>
+ <module>../../../modules/node-manager</module>
+ <module>../../../modules/policy</module>
+ <module>../../../modules/policy-security</module>
+ <module>../../../modules/policy-security-ws</module>
+ <module>../../../modules/policy-xml</module>
+ <module>../../../modules/sca-api</module>
+ <module>../../../modules/workspace</module>
+ <module>../../../modules/workspace-impl</module>
+ <module>../../../modules/workspace-xml</module>
+ <module>../../../modules/xsd</module>
+ <module>../../../modules/xsd-xml</module>
+ </modules>
+ </profile>
+ </profiles>
+
+</project>
diff --git a/branches/sca-java-1.x/distribution/features/process/pom.xml b/branches/sca-java-1.x/distribution/features/process/pom.xml index 4310034a0f..930117a95c 100644 --- a/branches/sca-java-1.x/distribution/features/process/pom.xml +++ b/branches/sca-java-1.x/distribution/features/process/pom.xml @@ -1,155 +1,154 @@ -<?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> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-distribution-features</artifactId> - <version>1.4-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <artifactId>tuscany-distribution-process</artifactId> - <name>Apache Tuscany SCA Business Process Distribution</name> - <packaging>pom</packaging> - - <dependencies> - - <!-- Core distribution --> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-distribution-core</artifactId> - <type>pom</type> - <version>1.4-SNAPSHOT</version> - </dependency> - - <!-- Implementations --> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-bpel-ode</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-xquery</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - </dependencies> - - <profiles> - - <!-- Default build profile that can be used to build the distro packages --> - <profile> - <id>default</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>distribution-package</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptors> - <descriptor>src/main/assembly/bin.xml</descriptor> - <descriptor>src/main/assembly/src.xml</descriptor> - </descriptors> - <tarLongFileMode>gnu</tarLongFileMode> - <finalName>apache-tuscany-sca-process-1.4-SNAPSHOT</finalName> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - - <!-- Profile that can be used to build the modules included in the distro --> - <profile> - <id>modules</id> - <modules> - <module>../../../modules/assembly</module> - <module>../../../modules/assembly-xml</module> - <module>../../../modules/assembly-xsd</module> - <module>../../../modules/binding-corba</module> - <module>../../../modules/binding-corba-runtime</module> - <module>../../../modules/binding-sca</module> - <module>../../../modules/binding-sca-xml</module> - <module>../../../modules/contribution</module> - <module>../../../modules/contribution-impl</module> - <module>../../../modules/contribution-java</module> - <module>../../../modules/contribution-namespace</module> - <module>../../../modules/contribution-xml</module> - <module>../../../modules/core</module> - <module>../../../modules/core-databinding</module> - <module>../../../modules/core-spi</module> - <module>../../../modules/data-api</module> - <module>../../../modules/databinding</module> - <module>../../../modules/databinding-jaxb</module> - <module>../../../modules/databinding-saxon</module> - <module>../../../modules/databinding-sdo</module> - <module>../../../modules/definitions</module> - <module>../../../modules/definitions-xml</module> - <module>../../../modules/endpoint</module> - <module>../../../modules/extensibility</module> - <module>../../../modules/extensibility-equinox</module> - <module>../../../modules/host-corba</module> - <module>../../../modules/host-corba-jse</module> - <module>../../../modules/host-embedded</module> - <module>../../../modules/host-http</module> - <module>../../../modules/implementation-bpel</module> - <module>../../../modules/implementation-bpel-ode</module> - <module>../../../modules/implementation-java</module> - <module>../../../modules/implementation-java-runtime</module> - <module>../../../modules/implementation-java-xml</module> - <module>../../../modules/implementation-node</module> - <module>../../../modules/implementation-node-runtime</module> - <module>../../../modules/implementation-xquery</module> - <module>../../../modules/interface</module> - <module>../../../modules/interface-java</module> - <module>../../../modules/interface-java-jaxws</module> - <module>../../../modules/interface-java-xml</module> - <module>../../../modules/interface-wsdl</module> - <module>../../../modules/interface-wsdl-xml</module> - <module>../../../modules/monitor</module> - <module>../../../modules/monitor-logging</module> - <module>../../../modules/node-api</module> - <module>../../../modules/node-impl</module> - <module>../../../modules/node-launcher</module> - <module>../../../modules/node-launcher-equinox</module> - <module>../../../modules/node-launcher-webapp</module> - <module>../../../modules/policy</module> - <module>../../../modules/policy-security</module> - <module>../../../modules/policy-xml</module> - <module>../../../modules/sca-api</module> - <module>../../../modules/xsd</module> - <module>../../../modules/xsd-xml</module> - </modules> - </profile> - </profiles> - -</project> +<?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>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-distribution-features</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>tuscany-distribution-process</artifactId>
+ <name>Apache Tuscany SCA Business Process Distribution</name>
+ <packaging>pom</packaging>
+
+ <dependencies>
+
+ <!-- Core distribution -->
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-distribution-core</artifactId>
+ <type>pom</type>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+
+ <!-- Implementations -->
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-implementation-bpel-ode</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-implementation-xquery</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
+ <profiles>
+
+ <!-- Default build profile that can be used to build the distro packages -->
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>distribution-package</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/bin.xml</descriptor>
+ <descriptor>src/main/assembly/src.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ <finalName>apache-tuscany-sca-process-1.4-SNAPSHOT</finalName>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!-- Profile that can be used to build the modules included in the distro -->
+ <profile>
+ <id>modules</id>
+ <modules>
+ <module>../../../modules/assembly</module>
+ <module>../../../modules/assembly-xml</module>
+ <module>../../../modules/assembly-xsd</module>
+ <module>../../../modules/binding-corba</module>
+ <module>../../../modules/binding-corba-runtime</module>
+ <module>../../../modules/binding-sca</module>
+ <module>../../../modules/binding-sca-xml</module>
+ <module>../../../modules/contribution</module>
+ <module>../../../modules/contribution-impl</module>
+ <module>../../../modules/contribution-java</module>
+ <module>../../../modules/contribution-namespace</module>
+ <module>../../../modules/contribution-xml</module>
+ <module>../../../modules/core</module>
+ <module>../../../modules/core-databinding</module>
+ <module>../../../modules/core-spi</module>
+ <module>../../../modules/data-api</module>
+ <module>../../../modules/databinding</module>
+ <module>../../../modules/databinding-jaxb</module>
+ <module>../../../modules/databinding-saxon</module>
+ <module>../../../modules/databinding-sdo</module>
+ <module>../../../modules/definitions</module>
+ <module>../../../modules/definitions-xml</module>
+ <module>../../../modules/endpoint</module>
+ <module>../../../modules/extensibility</module>
+ <module>../../../modules/extensibility-equinox</module>
+ <module>../../../modules/host-corba</module>
+ <module>../../../modules/host-corba-jse</module>
+ <module>../../../modules/host-embedded</module>
+ <module>../../../modules/host-http</module>
+ <module>../../../modules/implementation-bpel</module>
+ <module>../../../modules/implementation-bpel-ode</module>
+ <module>../../../modules/implementation-java</module>
+ <module>../../../modules/implementation-java-runtime</module>
+ <module>../../../modules/implementation-java-xml</module>
+ <module>../../../modules/implementation-node</module>
+ <module>../../../modules/implementation-node-runtime</module>
+ <module>../../../modules/implementation-xquery</module>
+ <module>../../../modules/interface</module>
+ <module>../../../modules/interface-java</module>
+ <module>../../../modules/interface-java-jaxws</module>
+ <module>../../../modules/interface-java-xml</module>
+ <module>../../../modules/interface-wsdl</module>
+ <module>../../../modules/interface-wsdl-xml</module>
+ <module>../../../modules/monitor</module>
+ <module>../../../modules/node-api</module>
+ <module>../../../modules/node-impl</module>
+ <module>../../../modules/node-launcher</module>
+ <module>../../../modules/node-launcher-equinox</module>
+ <module>../../../modules/node-launcher-webapp</module>
+ <module>../../../modules/policy</module>
+ <module>../../../modules/policy-security</module>
+ <module>../../../modules/policy-xml</module>
+ <module>../../../modules/sca-api</module>
+ <module>../../../modules/xsd</module>
+ <module>../../../modules/xsd-xml</module>
+ </modules>
+ </profile>
+ </profiles>
+
+</project>
diff --git a/branches/sca-java-1.x/distribution/features/repository/pom.xml b/branches/sca-java-1.x/distribution/features/repository/pom.xml index cfee564971..95afa7e730 100644 --- a/branches/sca-java-1.x/distribution/features/repository/pom.xml +++ b/branches/sca-java-1.x/distribution/features/repository/pom.xml @@ -1,180 +1,179 @@ -<?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> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-distribution-features</artifactId> - <version>1.4-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <artifactId>tuscany-distribution-repository</artifactId> - <name>Apache Tuscany SCA Maven Repository Distribution</name> - <packaging>pom</packaging> - - <dependencies> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-distribution-all</artifactId> - <type>pom</type> - <version>1.4-SNAPSHOT</version> - </dependency> - </dependencies> - - <profiles> - - <!-- Default build profile that can be used to build the distro packages --> - <profile> - <id>default</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>distribution-package</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptors> - <descriptor>src/main/assembly/repository.xml</descriptor> - </descriptors> - <tarLongFileMode>gnu</tarLongFileMode> - <finalName>apache-tuscany-sca-repository-1.4-SNAPSHOT</finalName> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - - <!-- Profile that can be used to build the modules included in the distro --> - <profile> - <id>modules</id> - <modules> - <module>../../../modules/assembly</module> - <module>../../../modules/assembly-xml</module> - <module>../../../modules/assembly-xsd</module> - <module>../../../modules/binding-atom</module> - <module>../../../modules/binding-atom-abdera</module> - <module>../../../modules/binding-corba</module> - <module>../../../modules/binding-corba-runtime</module> - <module>../../../modules/binding-ejb</module> - <module>../../../modules/binding-ejb-runtime</module> - <module>../../../modules/binding-http</module> - <module>../../../modules/binding-http-runtime</module> - <module>../../../modules/binding-jms</module> - <module>../../../modules/binding-jms-runtime</module> - <module>../../../modules/binding-jsonrpc</module> - <module>../../../modules/binding-jsonrpc-runtime</module> - <module>../../../modules/binding-rss</module> - <module>../../../modules/binding-rss-rome</module> - <module>../../../modules/binding-sca</module> - <module>../../../modules/binding-sca-axis2</module> - <module>../../../modules/binding-sca-xml</module> - <module>../../../modules/binding-ws</module> - <module>../../../modules/binding-ws-axis2</module> - <module>../../../modules/binding-ws-wsdlgen</module> - <module>../../../modules/binding-ws-xml</module> - <module>../../../modules/contribution</module> - <module>../../../modules/contribution-impl</module> - <module>../../../modules/contribution-java</module> - <module>../../../modules/contribution-namespace</module> - <module>../../../modules/contribution-resource</module> - <module>../../../modules/contribution-xml</module> - <module>../../../modules/core</module> - <module>../../../modules/core-databinding</module> - <module>../../../modules/core-spi</module> - <module>../../../modules/data-api</module> - <module>../../../modules/databinding</module> - <module>../../../modules/databinding-axiom</module> - <module>../../../modules/databinding-jaxb</module> - <module>../../../modules/databinding-jaxb-axiom</module> - <module>../../../modules/databinding-json</module> - <module>../../../modules/databinding-saxon</module> - <module>../../../modules/databinding-sdo</module> - <module>../../../modules/databinding-sdo-axiom</module> - <module>../../../modules/definitions</module> - <module>../../../modules/definitions-xml</module> - <module>../../../modules/domain-manager</module> - <module>../../../modules/endpoint</module> - <module>../../../modules/extensibility</module> - <module>../../../modules/extensibility-equinox</module> - <module>../../../modules/extension-helper</module> - <module>../../../modules/host-corba</module> - <module>../../../modules/host-corba-jse</module> - <module>../../../modules/host-ejb</module> - <module>../../../modules/host-embedded</module> - <module>../../../modules/host-http</module> - <module>../../../modules/host-jetty</module> - <module>../../../modules/implementation-bpel</module> - <module>../../../modules/implementation-bpel-ode</module> - <module>../../../modules/implementation-ejb</module> - <module>../../../modules/implementation-java</module> - <module>../../../modules/implementation-java-runtime</module> - <module>../../../modules/implementation-java-xml</module> - <module>../../../modules/implementation-node</module> - <module>../../../modules/implementation-node-runtime</module> - <module>../../../modules/implementation-resource</module> - <module>../../../modules/implementation-resource-runtime</module> - <module>../../../modules/implementation-script</module> - <module>../../../modules/implementation-spring</module> - <module>../../../modules/implementation-widget</module> - <module>../../../modules/implementation-widget-runtime</module> - <module>../../../modules/implementation-xquery</module> - <module>../../../modules/interface</module> - <module>../../../modules/interface-java</module> - <module>../../../modules/interface-java-jaxws</module> - <module>../../../modules/interface-java-xml</module> - <module>../../../modules/interface-wsdl</module> - <module>../../../modules/interface-wsdl-xml</module> - <module>../../../modules/monitor</module> - <module>../../../modules/monitor-logging</module> - <module>../../../modules/node-api</module> - <module>../../../modules/node-impl</module> - <module>../../../modules/node-launcher</module> - <module>../../../modules/node-launcher-equinox</module> - <module>../../../modules/node-launcher-webapp</module> - <module>../../../modules/node-manager</module> - <module>../../../modules/policy</module> - <module>../../../modules/policy-security</module> - <module>../../../modules/policy-security-ws</module> - <module>../../../modules/policy-xml</module> - <module>../../../modules/policy-xml-ws</module> - <module>../../../modules/sca-api</module> - <module>../../../modules/workspace</module> - <module>../../../modules/workspace-impl</module> - <module>../../../modules/workspace-xml</module> - <module>../../../modules/xsd</module> - <module>../../../modules/xsd-xml</module> - </modules> - </profile> - </profiles> - -</project> +<?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>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-distribution-features</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>tuscany-distribution-repository</artifactId>
+ <name>Apache Tuscany SCA Maven Repository Distribution</name>
+ <packaging>pom</packaging>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-distribution-all</artifactId>
+ <type>pom</type>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
+ <profiles>
+
+ <!-- Default build profile that can be used to build the distro packages -->
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>distribution-package</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/repository.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ <finalName>apache-tuscany-sca-repository-1.4-SNAPSHOT</finalName>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!-- Profile that can be used to build the modules included in the distro -->
+ <profile>
+ <id>modules</id>
+ <modules>
+ <module>../../../modules/assembly</module>
+ <module>../../../modules/assembly-xml</module>
+ <module>../../../modules/assembly-xsd</module>
+ <module>../../../modules/binding-atom</module>
+ <module>../../../modules/binding-atom-abdera</module>
+ <module>../../../modules/binding-corba</module>
+ <module>../../../modules/binding-corba-runtime</module>
+ <module>../../../modules/binding-ejb</module>
+ <module>../../../modules/binding-ejb-runtime</module>
+ <module>../../../modules/binding-http</module>
+ <module>../../../modules/binding-http-runtime</module>
+ <module>../../../modules/binding-jms</module>
+ <module>../../../modules/binding-jms-runtime</module>
+ <module>../../../modules/binding-jsonrpc</module>
+ <module>../../../modules/binding-jsonrpc-runtime</module>
+ <module>../../../modules/binding-rss</module>
+ <module>../../../modules/binding-rss-rome</module>
+ <module>../../../modules/binding-sca</module>
+ <module>../../../modules/binding-sca-axis2</module>
+ <module>../../../modules/binding-sca-xml</module>
+ <module>../../../modules/binding-ws</module>
+ <module>../../../modules/binding-ws-axis2</module>
+ <module>../../../modules/binding-ws-wsdlgen</module>
+ <module>../../../modules/binding-ws-xml</module>
+ <module>../../../modules/contribution</module>
+ <module>../../../modules/contribution-impl</module>
+ <module>../../../modules/contribution-java</module>
+ <module>../../../modules/contribution-namespace</module>
+ <module>../../../modules/contribution-resource</module>
+ <module>../../../modules/contribution-xml</module>
+ <module>../../../modules/core</module>
+ <module>../../../modules/core-databinding</module>
+ <module>../../../modules/core-spi</module>
+ <module>../../../modules/data-api</module>
+ <module>../../../modules/databinding</module>
+ <module>../../../modules/databinding-axiom</module>
+ <module>../../../modules/databinding-jaxb</module>
+ <module>../../../modules/databinding-jaxb-axiom</module>
+ <module>../../../modules/databinding-json</module>
+ <module>../../../modules/databinding-saxon</module>
+ <module>../../../modules/databinding-sdo</module>
+ <module>../../../modules/databinding-sdo-axiom</module>
+ <module>../../../modules/definitions</module>
+ <module>../../../modules/definitions-xml</module>
+ <module>../../../modules/domain-manager</module>
+ <module>../../../modules/endpoint</module>
+ <module>../../../modules/extensibility</module>
+ <module>../../../modules/extensibility-equinox</module>
+ <module>../../../modules/extension-helper</module>
+ <module>../../../modules/host-corba</module>
+ <module>../../../modules/host-corba-jse</module>
+ <module>../../../modules/host-ejb</module>
+ <module>../../../modules/host-embedded</module>
+ <module>../../../modules/host-http</module>
+ <module>../../../modules/host-jetty</module>
+ <module>../../../modules/implementation-bpel</module>
+ <module>../../../modules/implementation-bpel-ode</module>
+ <module>../../../modules/implementation-ejb</module>
+ <module>../../../modules/implementation-java</module>
+ <module>../../../modules/implementation-java-runtime</module>
+ <module>../../../modules/implementation-java-xml</module>
+ <module>../../../modules/implementation-node</module>
+ <module>../../../modules/implementation-node-runtime</module>
+ <module>../../../modules/implementation-resource</module>
+ <module>../../../modules/implementation-resource-runtime</module>
+ <module>../../../modules/implementation-script</module>
+ <module>../../../modules/implementation-spring</module>
+ <module>../../../modules/implementation-widget</module>
+ <module>../../../modules/implementation-widget-runtime</module>
+ <module>../../../modules/implementation-xquery</module>
+ <module>../../../modules/interface</module>
+ <module>../../../modules/interface-java</module>
+ <module>../../../modules/interface-java-jaxws</module>
+ <module>../../../modules/interface-java-xml</module>
+ <module>../../../modules/interface-wsdl</module>
+ <module>../../../modules/interface-wsdl-xml</module>
+ <module>../../../modules/monitor</module>
+ <module>../../../modules/node-api</module>
+ <module>../../../modules/node-impl</module>
+ <module>../../../modules/node-launcher</module>
+ <module>../../../modules/node-launcher-equinox</module>
+ <module>../../../modules/node-launcher-webapp</module>
+ <module>../../../modules/node-manager</module>
+ <module>../../../modules/policy</module>
+ <module>../../../modules/policy-security</module>
+ <module>../../../modules/policy-security-ws</module>
+ <module>../../../modules/policy-xml</module>
+ <module>../../../modules/policy-xml-ws</module>
+ <module>../../../modules/sca-api</module>
+ <module>../../../modules/workspace</module>
+ <module>../../../modules/workspace-impl</module>
+ <module>../../../modules/workspace-xml</module>
+ <module>../../../modules/xsd</module>
+ <module>../../../modules/xsd-xml</module>
+ </modules>
+ </profile>
+ </profiles>
+
+</project>
diff --git a/branches/sca-java-1.x/distribution/features/web20/pom.xml b/branches/sca-java-1.x/distribution/features/web20/pom.xml index 58fe78edd4..b2b6128c4d 100644 --- a/branches/sca-java-1.x/distribution/features/web20/pom.xml +++ b/branches/sca-java-1.x/distribution/features/web20/pom.xml @@ -1,208 +1,207 @@ -<?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> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-distribution-features</artifactId> - <version>1.4-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <artifactId>tuscany-distribution-web20</artifactId> - <name>Apache Tuscany SCA Web 2.0 Distribution</name> - <packaging>pom</packaging> - - <dependencies> - - <!-- Core distribution --> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-distribution-core</artifactId> - <type>pom</type> - <version>1.4-SNAPSHOT</version> - </dependency> - - <!-- Bindings --> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-atom-abdera</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-http-runtime</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-jsonrpc-runtime</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-rss-rome</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - - <!-- Contribution model --> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-contribution-resource</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - - <!-- Databindings --> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-databinding-json</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - - <!-- Hosts --> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-jetty</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - - <!-- Implementation types --> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-resource-runtime</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-widget-runtime</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - </dependencies> - - <profiles> - - <!-- Default build profile that can be used to build the distro packages --> - <profile> - <id>default</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>distribution-package</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptors> - <descriptor>src/main/assembly/bin.xml</descriptor> - <descriptor>src/main/assembly/src.xml</descriptor> - </descriptors> - <tarLongFileMode>gnu</tarLongFileMode> - <finalName>apache-tuscany-sca-web20-1.4-SNAPSHOT</finalName> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - - <!-- Profile that can be used to build the modules included in the distro --> - <profile> - <id>modules</id> - <modules> - <module>../../../modules/assembly</module> - <module>../../../modules/assembly-xml</module> - <module>../../../modules/assembly-xsd</module> - <module>../../../modules/binding-atom</module> - <module>../../../modules/binding-atom-abdera</module> - <module>../../../modules/binding-corba</module> - <module>../../../modules/binding-corba-runtime</module> - <module>../../../modules/binding-http</module> - <module>../../../modules/binding-http-runtime</module> - <module>../../../modules/binding-jsonrpc</module> - <module>../../../modules/binding-jsonrpc-runtime</module> - <module>../../../modules/binding-rss</module> - <module>../../../modules/binding-rss-rome</module> - <module>../../../modules/binding-sca</module> - <module>../../../modules/binding-sca-xml</module> - <module>../../../modules/contribution</module> - <module>../../../modules/contribution-impl</module> - <module>../../../modules/contribution-java</module> - <module>../../../modules/contribution-namespace</module> - <module>../../../modules/contribution-resource</module> - <module>../../../modules/contribution-xml</module> - <module>../../../modules/core</module> - <module>../../../modules/core-databinding</module> - <module>../../../modules/core-spi</module> - <module>../../../modules/data-api</module> - <module>../../../modules/databinding</module> - <module>../../../modules/databinding-jaxb</module> - <module>../../../modules/databinding-json</module> - <module>../../../modules/definitions</module> - <module>../../../modules/definitions-xml</module> - <module>../../../modules/endpoint</module> - <module>../../../modules/extensibility</module> - <module>../../../modules/extensibility-equinox</module> - <module>../../../modules/host-corba</module> - <module>../../../modules/host-corba-jse</module> - <module>../../../modules/host-embedded</module> - <module>../../../modules/host-http</module> - <module>../../../modules/host-jetty</module> - <module>../../../modules/implementation-java</module> - <module>../../../modules/implementation-java-runtime</module> - <module>../../../modules/implementation-java-xml</module> - <module>../../../modules/implementation-node</module> - <module>../../../modules/implementation-node-runtime</module> - <module>../../../modules/implementation-resource</module> - <module>../../../modules/implementation-resource-runtime</module> - <module>../../../modules/implementation-widget</module> - <module>../../../modules/implementation-widget-runtime</module> - <module>../../../modules/interface</module> - <module>../../../modules/interface-java</module> - <module>../../../modules/interface-java-jaxws</module> - <module>../../../modules/interface-java-xml</module> - <module>../../../modules/interface-wsdl</module> - <module>../../../modules/interface-wsdl-xml</module> - <module>../../../modules/monitor</module> - <module>../../../modules/monitor-logging</module> - <module>../../../modules/node-api</module> - <module>../../../modules/node-impl</module> - <module>../../../modules/node-launcher</module> - <module>../../../modules/node-launcher-equinox</module> - <module>../../../modules/node-launcher-webapp</module> - <module>../../../modules/policy</module> - <module>../../../modules/policy-security</module> - <module>../../../modules/policy-xml</module> - <module>../../../modules/sca-api</module> - <module>../../../modules/xsd</module> - <module>../../../modules/xsd-xml</module> - </modules> - </profile> - </profiles> - -</project> +<?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>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-distribution-features</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>tuscany-distribution-web20</artifactId>
+ <name>Apache Tuscany SCA Web 2.0 Distribution</name>
+ <packaging>pom</packaging>
+
+ <dependencies>
+
+ <!-- Core distribution -->
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-distribution-core</artifactId>
+ <type>pom</type>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+
+ <!-- Bindings -->
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-binding-atom-abdera</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-binding-http-runtime</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-binding-rss-rome</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+
+ <!-- Contribution model -->
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-contribution-resource</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+
+ <!-- Databindings -->
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-databinding-json</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+
+ <!-- Hosts -->
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-host-jetty</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+
+ <!-- Implementation types -->
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-implementation-resource-runtime</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-implementation-widget-runtime</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
+ <profiles>
+
+ <!-- Default build profile that can be used to build the distro packages -->
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>distribution-package</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/bin.xml</descriptor>
+ <descriptor>src/main/assembly/src.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ <finalName>apache-tuscany-sca-web20-1.4-SNAPSHOT</finalName>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!-- Profile that can be used to build the modules included in the distro -->
+ <profile>
+ <id>modules</id>
+ <modules>
+ <module>../../../modules/assembly</module>
+ <module>../../../modules/assembly-xml</module>
+ <module>../../../modules/assembly-xsd</module>
+ <module>../../../modules/binding-atom</module>
+ <module>../../../modules/binding-atom-abdera</module>
+ <module>../../../modules/binding-corba</module>
+ <module>../../../modules/binding-corba-runtime</module>
+ <module>../../../modules/binding-http</module>
+ <module>../../../modules/binding-http-runtime</module>
+ <module>../../../modules/binding-jsonrpc</module>
+ <module>../../../modules/binding-jsonrpc-runtime</module>
+ <module>../../../modules/binding-rss</module>
+ <module>../../../modules/binding-rss-rome</module>
+ <module>../../../modules/binding-sca</module>
+ <module>../../../modules/binding-sca-xml</module>
+ <module>../../../modules/contribution</module>
+ <module>../../../modules/contribution-impl</module>
+ <module>../../../modules/contribution-java</module>
+ <module>../../../modules/contribution-namespace</module>
+ <module>../../../modules/contribution-resource</module>
+ <module>../../../modules/contribution-xml</module>
+ <module>../../../modules/core</module>
+ <module>../../../modules/core-databinding</module>
+ <module>../../../modules/core-spi</module>
+ <module>../../../modules/data-api</module>
+ <module>../../../modules/databinding</module>
+ <module>../../../modules/databinding-jaxb</module>
+ <module>../../../modules/databinding-json</module>
+ <module>../../../modules/definitions</module>
+ <module>../../../modules/definitions-xml</module>
+ <module>../../../modules/endpoint</module>
+ <module>../../../modules/extensibility</module>
+ <module>../../../modules/extensibility-equinox</module>
+ <module>../../../modules/host-corba</module>
+ <module>../../../modules/host-corba-jse</module>
+ <module>../../../modules/host-embedded</module>
+ <module>../../../modules/host-http</module>
+ <module>../../../modules/host-jetty</module>
+ <module>../../../modules/implementation-java</module>
+ <module>../../../modules/implementation-java-runtime</module>
+ <module>../../../modules/implementation-java-xml</module>
+ <module>../../../modules/implementation-node</module>
+ <module>../../../modules/implementation-node-runtime</module>
+ <module>../../../modules/implementation-resource</module>
+ <module>../../../modules/implementation-resource-runtime</module>
+ <module>../../../modules/implementation-widget</module>
+ <module>../../../modules/implementation-widget-runtime</module>
+ <module>../../../modules/interface</module>
+ <module>../../../modules/interface-java</module>
+ <module>../../../modules/interface-java-jaxws</module>
+ <module>../../../modules/interface-java-xml</module>
+ <module>../../../modules/interface-wsdl</module>
+ <module>../../../modules/interface-wsdl-xml</module>
+ <module>../../../modules/monitor</module>
+ <module>../../../modules/node-api</module>
+ <module>../../../modules/node-impl</module>
+ <module>../../../modules/node-launcher</module>
+ <module>../../../modules/node-launcher-equinox</module>
+ <module>../../../modules/node-launcher-webapp</module>
+ <module>../../../modules/policy</module>
+ <module>../../../modules/policy-security</module>
+ <module>../../../modules/policy-xml</module>
+ <module>../../../modules/sca-api</module>
+ <module>../../../modules/xsd</module>
+ <module>../../../modules/xsd-xml</module>
+ </modules>
+ </profile>
+ </profiles>
+
+</project>
diff --git a/branches/sca-java-1.x/distribution/features/webservice/pom.xml b/branches/sca-java-1.x/distribution/features/webservice/pom.xml index 3edf5290b3..b334ab1418 100644 --- a/branches/sca-java-1.x/distribution/features/webservice/pom.xml +++ b/branches/sca-java-1.x/distribution/features/webservice/pom.xml @@ -1,230 +1,229 @@ -<?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> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-distribution-features</artifactId> - <version>1.4-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <artifactId>tuscany-distribution-webservice</artifactId> - <name>Apache Tuscany SCA Web Service Distribution</name> - <packaging>pom</packaging> - - <dependencies> - - <!-- Core distribution --> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-distribution-core</artifactId> - <type>pom</type> - <version>1.4-SNAPSHOT</version> - </dependency> - - <!-- Bindings --> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-sca-axis2</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-axis2</artifactId> - <version>1.4-SNAPSHOT</version> - <exclusions> - <exclusion> - <groupId>org.apache.ant</groupId> - <artifactId>ant-nodeps</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.axis2</groupId> - <artifactId>addressing</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.axis2</groupId> - <artifactId>axis2-xmlbeans</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.axis2</groupId> - <artifactId>axis2-adb-codegen</artifactId> - </exclusion> - <exclusion> - <groupId>bouncycastle</groupId> - <artifactId>bcprov-jdk15</artifactId> - </exclusion> - <exclusion> - <groupId>opensaml</groupId> - <artifactId>opensaml</artifactId> - </exclusion> - </exclusions> - </dependency> - - <!-- Databindings --> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-databinding-axiom</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-databinding-jaxb-axiom</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-databinding-sdo</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-databinding-sdo-axiom</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - - <!-- Hosts --> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-jetty</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - - <!-- Policy models --> - <!--dependency> NOW IN BINDING-WS-AXIS2-POLICY - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-policy-security-ws</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency--> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-policy-xml-ws</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - </dependencies> - - <profiles> - - <!-- Default build profile that can be used to build the distro packages --> - <profile> - <id>default</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>distribution-package</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptors> - <descriptor>src/main/assembly/bin.xml</descriptor> - <descriptor>src/main/assembly/src.xml</descriptor> - </descriptors> - <tarLongFileMode>gnu</tarLongFileMode> - <finalName>apache-tuscany-sca-webservice-1.4-SNAPSHOT</finalName> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - - <!-- Profile that can be used to build the modules included in the distro --> - <profile> - <id>modules</id> - <modules> - <module>../../../modules/assembly</module> - <module>../../../modules/assembly-xml</module> - <module>../../../modules/assembly-xsd</module> - <module>../../../modules/binding-corba</module> - <module>../../../modules/binding-corba-runtime</module> - <module>../../../modules/binding-sca</module> - <module>../../../modules/binding-sca-axis2</module> - <module>../../../modules/binding-sca-xml</module> - <module>../../../modules/binding-ws</module> - <module>../../../modules/binding-ws-axis2</module> - <module>../../../modules/binding-ws-axis2-policy</module> - <module>../../../modules/binding-ws-wsdlgen</module> - <module>../../../modules/binding-ws-xml</module> - <module>../../../modules/contribution</module> - <module>../../../modules/contribution-impl</module> - <module>../../../modules/contribution-java</module> - <module>../../../modules/contribution-namespace</module> - <module>../../../modules/contribution-xml</module> - <module>../../../modules/core</module> - <module>../../../modules/core-databinding</module> - <module>../../../modules/core-spi</module> - <module>../../../modules/data-api</module> - <module>../../../modules/databinding</module> - <module>../../../modules/databinding-axiom</module> - <module>../../../modules/databinding-jaxb</module> - <module>../../../modules/databinding-jaxb-axiom</module> - <module>../../../modules/databinding-sdo</module> - <module>../../../modules/databinding-sdo-axiom</module> - <module>../../../modules/definitions</module> - <module>../../../modules/definitions-xml</module> - <module>../../../modules/endpoint</module> - <module>../../../modules/extensibility</module> - <module>../../../modules/extensibility-equinox</module> - <module>../../../modules/host-corba</module> - <module>../../../modules/host-corba-jse</module> - <module>../../../modules/host-embedded</module> - <module>../../../modules/host-http</module> - <module>../../../modules/host-jetty</module> - <module>../../../modules/implementation-java</module> - <module>../../../modules/implementation-java-runtime</module> - <module>../../../modules/implementation-java-xml</module> - <module>../../../modules/implementation-node</module> - <module>../../../modules/implementation-node-runtime</module> - <module>../../../modules/interface</module> - <module>../../../modules/interface-java</module> - <module>../../../modules/interface-java-jaxws</module> - <module>../../../modules/interface-java-xml</module> - <module>../../../modules/interface-wsdl</module> - <module>../../../modules/interface-wsdl-xml</module> - <module>../../../modules/monitor</module> - <module>../../../modules/monitor-logging</module> - <module>../../../modules/node-api</module> - <module>../../../modules/node-impl</module> - <module>../../../modules/node-launcher</module> - <module>../../../modules/node-launcher-equinox</module> - <module>../../../modules/node-launcher-webapp</module> - <module>../../../modules/policy</module> - <module>../../../modules/policy-security</module> - <module>../../../modules/policy-security-ws</module> - <module>../../../modules/policy-xml</module> - <module>../../../modules/policy-xml-ws</module> - <module>../../../modules/sca-api</module> - <module>../../../modules/xsd</module> - <module>../../../modules/xsd-xml</module> - </modules> - </profile> - </profiles> - -</project> +<?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>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-distribution-features</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>tuscany-distribution-webservice</artifactId>
+ <name>Apache Tuscany SCA Web Service Distribution</name>
+ <packaging>pom</packaging>
+
+ <dependencies>
+
+ <!-- Core distribution -->
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-distribution-core</artifactId>
+ <type>pom</type>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+
+ <!-- Bindings -->
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-binding-sca-axis2</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-binding-ws-axis2</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>addressing</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-xmlbeans</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-adb-codegen</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>bouncycastle</groupId>
+ <artifactId>bcprov-jdk15</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>opensaml</groupId>
+ <artifactId>opensaml</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <!-- Databindings -->
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-databinding-axiom</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-databinding-jaxb-axiom</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-databinding-sdo</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-databinding-sdo-axiom</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+
+ <!-- Hosts -->
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-host-jetty</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+
+ <!-- Policy models -->
+ <!--dependency> NOW IN BINDING-WS-AXIS2-POLICY
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-policy-security-ws</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency-->
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-policy-xml-ws</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
+ <profiles>
+
+ <!-- Default build profile that can be used to build the distro packages -->
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>distribution-package</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/bin.xml</descriptor>
+ <descriptor>src/main/assembly/src.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ <finalName>apache-tuscany-sca-webservice-1.4-SNAPSHOT</finalName>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!-- Profile that can be used to build the modules included in the distro -->
+ <profile>
+ <id>modules</id>
+ <modules>
+ <module>../../../modules/assembly</module>
+ <module>../../../modules/assembly-xml</module>
+ <module>../../../modules/assembly-xsd</module>
+ <module>../../../modules/binding-corba</module>
+ <module>../../../modules/binding-corba-runtime</module>
+ <module>../../../modules/binding-sca</module>
+ <module>../../../modules/binding-sca-axis2</module>
+ <module>../../../modules/binding-sca-xml</module>
+ <module>../../../modules/binding-ws</module>
+ <module>../../../modules/binding-ws-axis2</module>
+ <module>../../../modules/binding-ws-axis2-policy</module>
+ <module>../../../modules/binding-ws-wsdlgen</module>
+ <module>../../../modules/binding-ws-xml</module>
+ <module>../../../modules/contribution</module>
+ <module>../../../modules/contribution-impl</module>
+ <module>../../../modules/contribution-java</module>
+ <module>../../../modules/contribution-namespace</module>
+ <module>../../../modules/contribution-xml</module>
+ <module>../../../modules/core</module>
+ <module>../../../modules/core-databinding</module>
+ <module>../../../modules/core-spi</module>
+ <module>../../../modules/data-api</module>
+ <module>../../../modules/databinding</module>
+ <module>../../../modules/databinding-axiom</module>
+ <module>../../../modules/databinding-jaxb</module>
+ <module>../../../modules/databinding-jaxb-axiom</module>
+ <module>../../../modules/databinding-sdo</module>
+ <module>../../../modules/databinding-sdo-axiom</module>
+ <module>../../../modules/definitions</module>
+ <module>../../../modules/definitions-xml</module>
+ <module>../../../modules/endpoint</module>
+ <module>../../../modules/extensibility</module>
+ <module>../../../modules/extensibility-equinox</module>
+ <module>../../../modules/host-corba</module>
+ <module>../../../modules/host-corba-jse</module>
+ <module>../../../modules/host-embedded</module>
+ <module>../../../modules/host-http</module>
+ <module>../../../modules/host-jetty</module>
+ <module>../../../modules/implementation-java</module>
+ <module>../../../modules/implementation-java-runtime</module>
+ <module>../../../modules/implementation-java-xml</module>
+ <module>../../../modules/implementation-node</module>
+ <module>../../../modules/implementation-node-runtime</module>
+ <module>../../../modules/interface</module>
+ <module>../../../modules/interface-java</module>
+ <module>../../../modules/interface-java-jaxws</module>
+ <module>../../../modules/interface-java-xml</module>
+ <module>../../../modules/interface-wsdl</module>
+ <module>../../../modules/interface-wsdl-xml</module>
+ <module>../../../modules/monitor</module>
+ <module>../../../modules/node-api</module>
+ <module>../../../modules/node-impl</module>
+ <module>../../../modules/node-launcher</module>
+ <module>../../../modules/node-launcher-equinox</module>
+ <module>../../../modules/node-launcher-webapp</module>
+ <module>../../../modules/policy</module>
+ <module>../../../modules/policy-security</module>
+ <module>../../../modules/policy-security-ws</module>
+ <module>../../../modules/policy-xml</module>
+ <module>../../../modules/policy-xml-ws</module>
+ <module>../../../modules/sca-api</module>
+ <module>../../../modules/xsd</module>
+ <module>../../../modules/xsd-xml</module>
+ </modules>
+ </profile>
+ </profiles>
+
+</project>
diff --git a/branches/sca-java-1.x/itest/builder/pom.xml b/branches/sca-java-1.x/itest/builder/pom.xml index 694783ea39..a2676bb4b6 100644 --- a/branches/sca-java-1.x/itest/builder/pom.xml +++ b/branches/sca-java-1.x/itest/builder/pom.xml @@ -44,7 +44,7 @@ <dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-monitor-logging</artifactId>
+ <artifactId>tuscany-monitor</artifactId>
<version>1.4-SNAPSHOT</version>
<scope>test</scope>
</dependency>
diff --git a/branches/sca-java-1.x/itest/contribution-classloader/contribution-test/pom.xml b/branches/sca-java-1.x/itest/contribution-classloader/contribution-test/pom.xml index b417012edd..280c6a13cb 100644 --- a/branches/sca-java-1.x/itest/contribution-classloader/contribution-test/pom.xml +++ b/branches/sca-java-1.x/itest/contribution-classloader/contribution-test/pom.xml @@ -44,7 +44,7 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-monitor-logging</artifactId> + <artifactId>tuscany-monitor</artifactId> <version>1.4-SNAPSHOT</version> <scope>runtime</scope> </dependency> diff --git a/branches/sca-java-1.x/itest/domain/pom.xml b/branches/sca-java-1.x/itest/domain/pom.xml index 45ce8c1081..25c4a76e1a 100644 --- a/branches/sca-java-1.x/itest/domain/pom.xml +++ b/branches/sca-java-1.x/itest/domain/pom.xml @@ -78,7 +78,7 @@ <dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-monitor-logging</artifactId>
+ <artifactId>tuscany-monitor</artifactId>
<version>1.4-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
diff --git a/branches/sca-java-1.x/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml b/branches/sca-java-1.x/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml index 5b8c5ee0f5..d174fc27d7 100644 --- a/branches/sca-java-1.x/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml +++ b/branches/sca-java-1.x/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml @@ -35,7 +35,7 @@ <dependencies> <dependency> <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-monitor-logging</artifactId> + <artifactId>tuscany-monitor</artifactId> <version>${pom.version}</version> </dependency> <dependency> diff --git a/branches/sca-java-1.x/itest/osgi-tuscany/tuscany-versioned/pom.xml b/branches/sca-java-1.x/itest/osgi-tuscany/tuscany-versioned/pom.xml index a218e34c3f..ccb403da1f 100644 --- a/branches/sca-java-1.x/itest/osgi-tuscany/tuscany-versioned/pom.xml +++ b/branches/sca-java-1.x/itest/osgi-tuscany/tuscany-versioned/pom.xml @@ -36,7 +36,7 @@ <dependencies> <dependency> <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-monitor-logging</artifactId> + <artifactId>tuscany-monitor</artifactId> <version>${pom.version}</version> </dependency> <dependency> diff --git a/branches/sca-java-1.x/itest/validation/pom.xml b/branches/sca-java-1.x/itest/validation/pom.xml index 828b209520..c671f4bf06 100644 --- a/branches/sca-java-1.x/itest/validation/pom.xml +++ b/branches/sca-java-1.x/itest/validation/pom.xml @@ -32,7 +32,7 @@ <dependencies> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-monitor-logging</artifactId> + <artifactId>tuscany-monitor</artifactId> <version>1.4-SNAPSHOT</version> </dependency> diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/ContributionReadException.java b/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/ContributionReadException.java index 9b0d51eb59..0b3a828a41 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/ContributionReadException.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/ContributionReadException.java @@ -22,7 +22,7 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import domain.CustomCompositeBuilder; @@ -52,7 +52,7 @@ public class ContributionReadException extends TestCase { public void testCalculator() { Monitor monitor = customDomain.getMonitorInstance(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("ContributionReadException", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/PolicyImplValidationException.java b/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/PolicyImplValidationException.java index e8476991a9..14e47f464a 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/PolicyImplValidationException.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/PolicyImplValidationException.java @@ -22,7 +22,7 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import domain.CustomCompositeBuilder; @@ -52,7 +52,7 @@ public class PolicyImplValidationException extends TestCase { public void testCalculator() { Monitor monitor = customDomain.getMonitorInstance(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("PolicyImplValidationException", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/PolicyServiceValidationException.java b/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/PolicyServiceValidationException.java index 8ae156d63e..c4cdc2358d 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/PolicyServiceValidationException.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/PolicyServiceValidationException.java @@ -22,7 +22,7 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import domain.CustomCompositeBuilder; @@ -52,7 +52,7 @@ public class PolicyServiceValidationException extends TestCase { public void testCalculator() { Monitor monitor = customDomain.getMonitorInstance(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("PolicyServiceValidationException", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/UnexpectedBindingElement.java b/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/UnexpectedBindingElement.java index d757ff98dd..18d9820d10 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/UnexpectedBindingElement.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/UnexpectedBindingElement.java @@ -22,7 +22,7 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import domain.CustomCompositeBuilder; @@ -52,7 +52,7 @@ public class UnexpectedBindingElement extends TestCase { public void testCalculator() { Monitor monitor = customDomain.getMonitorInstance(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("UnexpectedBindingElement", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/UnexpectedImplementationElement.java b/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/UnexpectedImplementationElement.java index 9a231a18c7..bd211aad97 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/UnexpectedImplementationElement.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/UnexpectedImplementationElement.java @@ -22,7 +22,7 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import domain.CustomCompositeBuilder; @@ -52,7 +52,7 @@ public class UnexpectedImplementationElement extends TestCase { public void testCalculator() { Monitor monitor = customDomain.getMonitorInstance(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("UnexpectedImplementationElement", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/UnexpectedInterfaceElement.java b/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/UnexpectedInterfaceElement.java index 4ae88b9ba3..61956a8712 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/UnexpectedInterfaceElement.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/UnexpectedInterfaceElement.java @@ -22,7 +22,7 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import domain.CustomCompositeBuilder; /** @@ -51,7 +51,7 @@ public class UnexpectedInterfaceElement extends TestCase { public void testCalculator() { Monitor monitor = customDomain.getMonitorInstance(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("UnexpectedInterfaceElement", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/ejb/UnknownEJBSessionTypeTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/ejb/UnknownEJBSessionTypeTestCase.java index ff94ad7b93..773f347170 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/ejb/UnknownEJBSessionTypeTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/ejb/UnknownEJBSessionTypeTestCase.java @@ -22,7 +22,7 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import domain.CustomCompositeBuilder; @@ -59,7 +59,7 @@ public class UnknownEJBSessionTypeTestCase extends TestCase { public void testCalculator() { Monitor monitor = customDomain.getMonitorInstance(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("UnknownEJBSessionType", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/ejb/UnknownEJBVersionTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/ejb/UnknownEJBVersionTestCase.java index a192674aeb..9ebfa0637b 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/ejb/UnknownEJBVersionTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/ejb/UnknownEJBVersionTestCase.java @@ -22,7 +22,7 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import domain.CustomCompositeBuilder; @@ -58,7 +58,7 @@ public class UnknownEJBVersionTestCase extends TestCase { public void testCalculator() { Monitor monitor = customDomain.getMonitorInstance(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("UnknownEJBVersion", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessActivationSpecTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessActivationSpecTestCase.java index e0e5347d96..6e7f460a09 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessActivationSpecTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessActivationSpecTestCase.java @@ -22,7 +22,7 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import domain.CustomCompositeBuilder; @@ -52,7 +52,7 @@ public class DoesntProcessActivationSpecTestCase extends TestCase { public void testCalculator() { Monitor monitor = customDomain.getMonitorInstance(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("DoesntProcessActivationSpec", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessDestinationTypeTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessDestinationTypeTestCase.java index 9e08afec09..d32bb33d93 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessDestinationTypeTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessDestinationTypeTestCase.java @@ -22,7 +22,7 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import domain.CustomCompositeBuilder; @@ -52,7 +52,7 @@ public class DoesntProcessDestinationTypeTestCase extends TestCase { public void testCalculator() { Monitor monitor = customDomain.getMonitorInstance(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("DoesntProcessDestinationType", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessHeadersTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessHeadersTestCase.java index ed96072780..2ba2e6cd12 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessHeadersTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessHeadersTestCase.java @@ -22,7 +22,7 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import org.junit.Ignore; import domain.CustomCompositeBuilder; @@ -54,7 +54,7 @@ public class DoesntProcessHeadersTestCase extends TestCase { @Ignore("TUSCANY-2532") public void testCalculator() { Monitor monitor = customDomain.getMonitorInstance(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); // assertEquals("DoesntProcessHeaders", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessResourceAdapterTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessResourceAdapterTestCase.java index a2a5b0b872..06b5140485 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessResourceAdapterTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessResourceAdapterTestCase.java @@ -22,7 +22,7 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import domain.CustomCompositeBuilder; @@ -52,7 +52,7 @@ public class DoesntProcessResourceAdapterTestCase extends TestCase { public void testCalculator() { Monitor monitor = customDomain.getMonitorInstance(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("DoesntProcessResourceAdapter", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessResponseActivationSpecTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessResponseActivationSpecTestCase.java index 64b41623de..3cd9e54fea 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessResponseActivationSpecTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessResponseActivationSpecTestCase.java @@ -22,7 +22,7 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import domain.CustomCompositeBuilder; @@ -52,7 +52,7 @@ public class DoesntProcessResponseActivationSpecTestCase extends TestCase { public void testCalculator() { Monitor monitor = customDomain.getMonitorInstance(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("DoesntProcessResponseActivationSpec", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessResponseConnectionFactoryTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessResponseConnectionFactoryTestCase.java index 86fbe51dad..78753fc82f 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessResponseConnectionFactoryTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessResponseConnectionFactoryTestCase.java @@ -22,7 +22,7 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import domain.CustomCompositeBuilder; @@ -52,7 +52,7 @@ public class DoesntProcessResponseConnectionFactoryTestCase extends TestCase { public void testCalculator() { Monitor monitor = customDomain.getMonitorInstance(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("DoesntProcessResponseConnectionFactory", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessResponseDestinationTypeTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessResponseDestinationTypeTestCase.java index 6e884c41cd..011d9e427d 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessResponseDestinationTypeTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessResponseDestinationTypeTestCase.java @@ -22,7 +22,7 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import domain.CustomCompositeBuilder; @@ -52,7 +52,7 @@ public class DoesntProcessResponseDestinationTypeTestCase extends TestCase { public void testCalculator() { Monitor monitor = customDomain.getMonitorInstance(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("DoesntProcessResponseDestinationType", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/InvalidCorrelationSchemeTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/InvalidCorrelationSchemeTestCase.java index c237f8af18..f0b798c2e4 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/InvalidCorrelationSchemeTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/InvalidCorrelationSchemeTestCase.java @@ -22,7 +22,7 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import domain.CustomCompositeBuilder; @@ -52,7 +52,7 @@ public class InvalidCorrelationSchemeTestCase extends TestCase { public void testCalculator() { Monitor monitor = customDomain.getMonitorInstance(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("InvalidCorrelationScheme", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/InvalidJMSDeliveryModeTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/InvalidJMSDeliveryModeTestCase.java index 52dc7e5795..a114501098 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/InvalidJMSDeliveryModeTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/InvalidJMSDeliveryModeTestCase.java @@ -22,7 +22,7 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +52,7 @@ public class InvalidJMSDeliveryModeTestCase extends TestCase { public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("InvalidJMSDeliveryMode", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/InvalidJMSPriorityTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/InvalidJMSPriorityTestCase.java index a93df290c3..d31e02054a 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/InvalidJMSPriorityTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/InvalidJMSPriorityTestCase.java @@ -22,7 +22,7 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +52,7 @@ public class InvalidJMSPriorityTestCase extends TestCase { public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("InvalidJMSPriority", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/InvalidResponseDestinationTypeTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/InvalidResponseDestinationTypeTestCase.java index 949ec02134..1727217fe0 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/InvalidResponseDestinationTypeTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/InvalidResponseDestinationTypeTestCase.java @@ -22,7 +22,7 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import domain.CustomCompositeBuilder; @@ -52,7 +52,7 @@ public class InvalidResponseDestinationTypeTestCase extends TestCase { public void testCalculator() { Monitor monitor = customDomain.getMonitorInstance(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("InvalidResponseDestinationType", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MissingActivationSpecNameTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MissingActivationSpecNameTestCase.java index d38a88744f..33bf2882e5 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MissingActivationSpecNameTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MissingActivationSpecNameTestCase.java @@ -22,7 +22,7 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import domain.CustomCompositeBuilder; @@ -52,7 +52,7 @@ public class MissingActivationSpecNameTestCase extends TestCase { public void testCalculator() { Monitor monitor = customDomain.getMonitorInstance(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getProblems().get(1); + Problem problem = ((DefaultMonitorImpl)monitor).getProblems().get(1); assertNotNull(problem); assertEquals("MissingActivationSpecName", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MissingConnectionFactoryNameTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MissingConnectionFactoryNameTestCase.java index 6999ae7969..fcb4345293 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MissingConnectionFactoryNameTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MissingConnectionFactoryNameTestCase.java @@ -22,7 +22,7 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import domain.CustomCompositeBuilder; @@ -52,7 +52,7 @@ public class MissingConnectionFactoryNameTestCase extends TestCase { public void testCalculator() { Monitor monitor = customDomain.getMonitorInstance(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getProblems().get(1); + Problem problem = ((DefaultMonitorImpl)monitor).getProblems().get(1); assertNotNull(problem); assertEquals("MissingConnectionFactoryName", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MissingResponseActivationSpecTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MissingResponseActivationSpecTestCase.java index 7333fc0f1e..04d1ba1055 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MissingResponseActivationSpecTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MissingResponseActivationSpecTestCase.java @@ -22,7 +22,7 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import domain.CustomCompositeBuilder; @@ -52,7 +52,7 @@ public class MissingResponseActivationSpecTestCase extends TestCase { public void testCalculator() { Monitor monitor = customDomain.getMonitorInstance(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getProblems().get(1); + Problem problem = ((DefaultMonitorImpl)monitor).getProblems().get(1); assertNotNull(problem); assertEquals("MissingResponseActivationSpec", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MissingResponseConnectionFactoryTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MissingResponseConnectionFactoryTestCase.java index ca0ef9a294..8725a714e8 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MissingResponseConnectionFactoryTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MissingResponseConnectionFactoryTestCase.java @@ -22,7 +22,7 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import domain.CustomCompositeBuilder; @@ -52,7 +52,7 @@ public class MissingResponseConnectionFactoryTestCase extends TestCase { public void testCalculator() { Monitor monitor = customDomain.getMonitorInstance(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getProblems().get(1); + Problem problem = ((DefaultMonitorImpl)monitor).getProblems().get(1); assertNotNull(problem); assertEquals("MissingResponseConnectionFactory", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MustStartWithSchemaTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MustStartWithSchemaTestCase.java index d9e1c782a8..b62cd22d6f 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MustStartWithSchemaTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MustStartWithSchemaTestCase.java @@ -22,7 +22,7 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import domain.CustomCompositeBuilder; @@ -52,7 +52,7 @@ public class MustStartWithSchemaTestCase extends TestCase { public void testCalculator() { Monitor monitor = customDomain.getMonitorInstance(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("MustStartWithSchema", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/UnexpectedElementTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/UnexpectedElementTestCase.java index 3e4e36d839..90a82ebe1f 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/UnexpectedElementTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/UnexpectedElementTestCase.java @@ -22,7 +22,7 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import domain.CustomCompositeBuilder; @@ -52,7 +52,7 @@ public class UnexpectedElementTestCase extends TestCase { public void testCalculator() { Monitor monitor = customDomain.getMonitorInstance(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("UnexpectedElement", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/UnexpectedResponseElementTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/UnexpectedResponseElementTestCase.java index 60ea47a85f..9227674815 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/UnexpectedResponseElementTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/UnexpectedResponseElementTestCase.java @@ -22,7 +22,7 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import domain.CustomCompositeBuilder; @@ -52,7 +52,7 @@ public class UnexpectedResponseElementTestCase extends TestCase { public void testCalculator() { Monitor monitor = customDomain.getMonitorInstance(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("UnexpectedResponseElement", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/UnknownTokenInURITestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/UnknownTokenInURITestCase.java index 6a75a35f99..df86fe1564 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/UnknownTokenInURITestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/UnknownTokenInURITestCase.java @@ -22,7 +22,7 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import domain.CustomCompositeBuilder; @@ -52,7 +52,7 @@ public class UnknownTokenInURITestCase extends TestCase { public void testCalculator() { Monitor monitor = customDomain.getMonitorInstance(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("UnknownTokenInURI", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/InvalidWsdlElementAttrTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/InvalidWsdlElementAttrTestCase.java index c0f60a848f..00e6873361 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/InvalidWsdlElementAttrTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/InvalidWsdlElementAttrTestCase.java @@ -22,7 +22,7 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import domain.CustomCompositeBuilder; @@ -52,7 +52,7 @@ public class InvalidWsdlElementAttrTestCase extends TestCase { public void testCalculator() { Monitor monitor = customDomain.getMonitorInstance(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("InvalidWsdlElementAttr", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/MustUseWsdlBindingTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/MustUseWsdlBindingTestCase.java index 5a74194796..6b2bf20329 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/MustUseWsdlBindingTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/MustUseWsdlBindingTestCase.java @@ -22,7 +22,7 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import domain.CustomCompositeBuilder; @@ -52,7 +52,7 @@ public class MustUseWsdlBindingTestCase extends TestCase { public void testCalculator() { Monitor monitor = customDomain.getMonitorInstance(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("MustUseWsdlBinding", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/WsdlBindingDoesNotMatchTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/WsdlBindingDoesNotMatchTestCase.java index 7991de7176..8c21abb896 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/WsdlBindingDoesNotMatchTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/WsdlBindingDoesNotMatchTestCase.java @@ -22,7 +22,7 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import domain.CustomCompositeBuilder; @@ -52,7 +52,7 @@ public class WsdlBindingDoesNotMatchTestCase extends TestCase { public void testCalculator() { Monitor monitor = customDomain.getMonitorInstance(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("WsdlBindingDoesNotMatch", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/WsdlPortTypeDoesNotMatchTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/WsdlPortTypeDoesNotMatchTestCase.java index 1ef5f7b00a..83b4722b60 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/WsdlPortTypeDoesNotMatchTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/WsdlPortTypeDoesNotMatchTestCase.java @@ -22,7 +22,7 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +52,7 @@ public class WsdlPortTypeDoesNotMatchTestCase extends TestCase { public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("WsdlPortTypeDoesNotMatch", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/WsdlServiceDoesNotMatchTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/WsdlServiceDoesNotMatchTestCase.java index a0a7d12b9f..8f7786f08a 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/WsdlServiceDoesNotMatchTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/WsdlServiceDoesNotMatchTestCase.java @@ -22,7 +22,7 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import domain.CustomCompositeBuilder; @@ -52,7 +52,7 @@ public class WsdlServiceDoesNotMatchTestCase extends TestCase { public void testCalculator() { Monitor monitor = customDomain.getMonitorInstance(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("WsdlServiceDoesNotMatch", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ComponentReferenceTargetNotFoundTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ComponentReferenceTargetNotFoundTestCase.java index 555810f453..6426e8599b 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ComponentReferenceTargetNotFoundTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ComponentReferenceTargetNotFoundTestCase.java @@ -27,7 +27,7 @@ import org.apache.tuscany.sca.core.UtilityExtensionPoint; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.MonitorFactory; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import org.apache.tuscany.sca.node.SCAClient; import org.apache.tuscany.sca.node.SCAContribution; import org.apache.tuscany.sca.node.SCANode; @@ -68,7 +68,7 @@ public class ComponentReferenceTargetNotFoundTestCase extends TestCase { UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class); MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class); Monitor monitor = monitorFactory.createMonitor(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("ComponentReferenceTargetNotFound", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/DuplicateComponentNameTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/DuplicateComponentNameTestCase.java index 4d70df1102..5e41d1d1ed 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/DuplicateComponentNameTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/DuplicateComponentNameTestCase.java @@ -22,7 +22,7 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import domain.CustomCompositeBuilder; @@ -53,7 +53,7 @@ public class DuplicateComponentNameTestCase extends TestCase { public void testCalculator() { Monitor monitor = customDomain.getMonitorInstance(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("DuplicateComponentName", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/DuplicateImplementationPropertyNameTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/DuplicateImplementationPropertyNameTestCase.java index 7593f39991..173d1e4a20 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/DuplicateImplementationPropertyNameTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/DuplicateImplementationPropertyNameTestCase.java @@ -27,7 +27,7 @@ import org.apache.tuscany.sca.core.UtilityExtensionPoint; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.MonitorFactory; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import org.apache.tuscany.sca.node.SCAContribution; import org.apache.tuscany.sca.node.SCANode; import org.apache.tuscany.sca.node.SCANodeFactory; @@ -56,7 +56,7 @@ public class DuplicateImplementationPropertyNameTestCase extends TestCase { UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class); MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class); Monitor monitor = monitorFactory.createMonitor(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("DuplicateImplementationPropertyName", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/DuplicateImplementationReferenceNameTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/DuplicateImplementationReferenceNameTestCase.java index 0a711175dc..e016a1465b 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/DuplicateImplementationReferenceNameTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/DuplicateImplementationReferenceNameTestCase.java @@ -27,7 +27,7 @@ import org.apache.tuscany.sca.core.UtilityExtensionPoint; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.MonitorFactory; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import org.apache.tuscany.sca.node.SCAContribution; import org.apache.tuscany.sca.node.SCANode; import org.apache.tuscany.sca.node.SCANodeFactory; @@ -57,7 +57,7 @@ public class DuplicateImplementationReferenceNameTestCase extends TestCase { UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class); MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class); Monitor monitor = monitorFactory.createMonitor(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("DuplicateImplementationReferenceName", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/DuplicatePropertyNameTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/DuplicatePropertyNameTestCase.java index 10660795a7..2e4a3daeca 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/DuplicatePropertyNameTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/DuplicatePropertyNameTestCase.java @@ -27,7 +27,7 @@ import org.apache.tuscany.sca.core.UtilityExtensionPoint; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.MonitorFactory; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import org.apache.tuscany.sca.node.SCAClient; import org.apache.tuscany.sca.node.SCAContribution; import org.apache.tuscany.sca.node.SCANode; @@ -62,7 +62,7 @@ public class DuplicatePropertyNameTestCase extends TestCase { UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class); MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class); Monitor monitor = monitorFactory.createMonitor(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("DuplicateComponentPropertyName", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java index 15b4b15989..38bb190af6 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java @@ -27,7 +27,7 @@ import org.apache.tuscany.sca.core.UtilityExtensionPoint; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.MonitorFactory; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import org.apache.tuscany.sca.node.SCAClient; import org.apache.tuscany.sca.node.SCAContribution; import org.apache.tuscany.sca.node.SCANode; @@ -62,7 +62,7 @@ public class DuplicateReferenceNameTestCase extends TestCase { UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class); MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class); Monitor monitor = monitorFactory.createMonitor(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("DuplicateComponentReferenceName", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/MultipleBindingsForServiceTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/MultipleBindingsForServiceTestCase.java index 55741ec2ef..0bbb3a5074 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/MultipleBindingsForServiceTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/MultipleBindingsForServiceTestCase.java @@ -27,7 +27,7 @@ import org.apache.tuscany.sca.core.UtilityExtensionPoint; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.MonitorFactory; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import org.apache.tuscany.sca.node.SCAClient; import org.apache.tuscany.sca.node.SCAContribution; import org.apache.tuscany.sca.node.SCANode; @@ -62,7 +62,7 @@ public class MultipleBindingsForServiceTestCase extends TestCase { UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class); MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class); Monitor monitor = monitorFactory.createMonitor(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("MultipleBindingsForService", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/NoComponentImplementationTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/NoComponentImplementationTestCase.java index 7f8bd68e5e..d8a19eb5c7 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/NoComponentImplementationTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/NoComponentImplementationTestCase.java @@ -27,7 +27,7 @@ import org.apache.tuscany.sca.core.UtilityExtensionPoint; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.MonitorFactory; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import org.apache.tuscany.sca.node.SCAContribution; import org.apache.tuscany.sca.node.SCANode; import org.apache.tuscany.sca.node.SCANodeFactory; @@ -58,7 +58,7 @@ public class NoComponentImplementationTestCase extends TestCase { UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class); MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class); Monitor monitor = monitorFactory.createMonitor(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("NoComponentImplementation", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/NoCompositeNamespaceTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/NoCompositeNamespaceTestCase.java index 1f26d3a7d6..313c8fdbe0 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/NoCompositeNamespaceTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/NoCompositeNamespaceTestCase.java @@ -27,7 +27,7 @@ import org.apache.tuscany.sca.core.UtilityExtensionPoint; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.MonitorFactory; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import org.apache.tuscany.sca.node.SCAClient; import org.apache.tuscany.sca.node.SCAContribution; import org.apache.tuscany.sca.node.SCANode; @@ -62,7 +62,7 @@ public class NoCompositeNamespaceTestCase extends TestCase { UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class); MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class); Monitor monitor = monitorFactory.createMonitor(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("NoCompositeNamespace", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/NoMatchingBindingTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/NoMatchingBindingTestCase.java index d398efc9ea..cf86d01f3d 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/NoMatchingBindingTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/NoMatchingBindingTestCase.java @@ -27,7 +27,7 @@ import org.apache.tuscany.sca.core.UtilityExtensionPoint; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.MonitorFactory; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import org.apache.tuscany.sca.node.SCAClient; import org.apache.tuscany.sca.node.SCAContribution; import org.apache.tuscany.sca.node.SCANode; @@ -64,7 +64,7 @@ public class NoMatchingBindingTestCase extends TestCase { UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class); MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class); Monitor monitor = monitorFactory.createMonitor(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("NoMatchingBinding", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/PromotedReferenceNotFoundTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/PromotedReferenceNotFoundTestCase.java index 9d2f028dea..3578567b2a 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/PromotedReferenceNotFoundTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/PromotedReferenceNotFoundTestCase.java @@ -27,7 +27,7 @@ import org.apache.tuscany.sca.core.UtilityExtensionPoint; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.MonitorFactory; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import org.apache.tuscany.sca.node.SCAClient; import org.apache.tuscany.sca.node.SCAContribution; import org.apache.tuscany.sca.node.SCANode; @@ -62,7 +62,7 @@ public class PromotedReferenceNotFoundTestCase extends TestCase { UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class); MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class); Monitor monitor = monitorFactory.createMonitor(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("PromotedReferenceNotFound", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/PromotedServiceNotFoundTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/PromotedServiceNotFoundTestCase.java index 7f836e4b01..4688f836e0 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/PromotedServiceNotFoundTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/PromotedServiceNotFoundTestCase.java @@ -27,7 +27,7 @@ import org.apache.tuscany.sca.core.UtilityExtensionPoint; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.MonitorFactory; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import org.apache.tuscany.sca.node.SCAClient; import org.apache.tuscany.sca.node.SCAContribution; import org.apache.tuscany.sca.node.SCANode; @@ -62,7 +62,7 @@ public class PromotedServiceNotFoundTestCase extends TestCase { UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class); MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class); Monitor monitor = monitorFactory.createMonitor(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("PromotedServiceNotFound", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/PropertyAttributeMustSupplyNullTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/PropertyAttributeMustSupplyNullTestCase.java index 04c2594cd3..b0883a5227 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/PropertyAttributeMustSupplyNullTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/PropertyAttributeMustSupplyNullTestCase.java @@ -27,7 +27,7 @@ import org.apache.tuscany.sca.core.UtilityExtensionPoint; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.MonitorFactory; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import org.apache.tuscany.sca.node.SCAClient; import org.apache.tuscany.sca.node.SCAContribution; import org.apache.tuscany.sca.node.SCANode; @@ -62,7 +62,7 @@ public class PropertyAttributeMustSupplyNullTestCase extends TestCase { UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class); MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class); Monitor monitor = monitorFactory.createMonitor(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("PropertyMustSupplyNull", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/PropertyAttributeTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/PropertyAttributeTestCase.java index 3dabfecbb6..1d6f905c20 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/PropertyAttributeTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/PropertyAttributeTestCase.java @@ -27,7 +27,7 @@ import org.apache.tuscany.sca.core.UtilityExtensionPoint; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.MonitorFactory; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import org.apache.tuscany.sca.node.SCAClient; import org.apache.tuscany.sca.node.SCAContribution; import org.apache.tuscany.sca.node.SCANode; @@ -62,7 +62,7 @@ public class PropertyAttributeTestCase extends TestCase { UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class); MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class); Monitor monitor = monitorFactory.createMonitor(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("PropertyMustSupplyIncompatible", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/PropertyNotFoundTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/PropertyNotFoundTestCase.java index 0dca8ed1df..4d91dfb79c 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/PropertyNotFoundTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/PropertyNotFoundTestCase.java @@ -27,7 +27,7 @@ import org.apache.tuscany.sca.core.UtilityExtensionPoint; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.MonitorFactory; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import org.apache.tuscany.sca.node.SCAClient; import org.apache.tuscany.sca.node.SCAContribution; import org.apache.tuscany.sca.node.SCANode; @@ -62,7 +62,7 @@ public class PropertyNotFoundTestCase extends TestCase { UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class); MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class); Monitor monitor = monitorFactory.createMonitor(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("PropertyNotFound", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/PropertyOverrideManyAttributeTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/PropertyOverrideManyAttributeTestCase.java index 37f7ef352e..73a83dd074 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/PropertyOverrideManyAttributeTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/PropertyOverrideManyAttributeTestCase.java @@ -27,7 +27,7 @@ import org.apache.tuscany.sca.core.UtilityExtensionPoint; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.MonitorFactory; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import org.apache.tuscany.sca.node.SCAClient; import org.apache.tuscany.sca.node.SCAContribution; import org.apache.tuscany.sca.node.SCANode; @@ -62,7 +62,7 @@ public class PropertyOverrideManyAttributeTestCase extends TestCase { UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class); MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class); Monitor monitor = monitorFactory.createMonitor(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("PropertyOverrideManyAttribute", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleComponentInterfaceTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleComponentInterfaceTestCase.java index ab57283a9e..993ccde9fd 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleComponentInterfaceTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleComponentInterfaceTestCase.java @@ -27,7 +27,7 @@ import org.apache.tuscany.sca.core.UtilityExtensionPoint; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.MonitorFactory; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import org.apache.tuscany.sca.node.SCAClient; import org.apache.tuscany.sca.node.SCAContribution; import org.apache.tuscany.sca.node.SCANode; @@ -62,7 +62,7 @@ public class ReferenceIncompatibleComponentInterfaceTestCase extends TestCase { UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class); MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class); Monitor monitor = monitorFactory.createMonitor(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("ReferenceIncompatibleComponentInterface", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleInterfaceTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleInterfaceTestCase.java index 4c3cc3856a..6dc8a321fc 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleInterfaceTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleInterfaceTestCase.java @@ -27,7 +27,7 @@ import org.apache.tuscany.sca.core.UtilityExtensionPoint; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.MonitorFactory; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import org.apache.tuscany.sca.node.SCAClient; import org.apache.tuscany.sca.node.SCAContribution; import org.apache.tuscany.sca.node.SCANode; @@ -62,7 +62,7 @@ public class ReferenceIncompatibleInterfaceTestCase extends TestCase { UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class); MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class); Monitor monitor = monitorFactory.createMonitor(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("ReferenceIncompatibleInterface", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleMultiplicityTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleMultiplicityTestCase.java index 06fb06f6ad..66b233b87a 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleMultiplicityTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleMultiplicityTestCase.java @@ -27,7 +27,7 @@ import org.apache.tuscany.sca.core.UtilityExtensionPoint; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.MonitorFactory; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import org.apache.tuscany.sca.node.SCAClient; import org.apache.tuscany.sca.node.SCAContribution; import org.apache.tuscany.sca.node.SCANode; @@ -62,7 +62,7 @@ public class ReferenceIncompatibleMultiplicityTestCase extends TestCase { UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class); MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class); Monitor monitor = monitorFactory.createMonitor(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("ReferenceIncompatibleMultiplicity", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ReferenceNotFoundTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ReferenceNotFoundTestCase.java index 6bacc8b05e..2e676282ae 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ReferenceNotFoundTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ReferenceNotFoundTestCase.java @@ -27,7 +27,7 @@ import org.apache.tuscany.sca.core.UtilityExtensionPoint; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.MonitorFactory; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import org.apache.tuscany.sca.node.SCAClient; import org.apache.tuscany.sca.node.SCAContribution; import org.apache.tuscany.sca.node.SCANode; @@ -73,7 +73,7 @@ public class ReferenceNotFoundTestCase extends TestCase { public void testCalculator() throws Exception { Monitor monitor = customDomain.getMonitorInstance(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("ReferenceNotFound", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ReferenceWithoutTargetsTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ReferenceWithoutTargetsTestCase.java index d615857105..ef67ece5e9 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ReferenceWithoutTargetsTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ReferenceWithoutTargetsTestCase.java @@ -27,7 +27,7 @@ import org.apache.tuscany.sca.core.UtilityExtensionPoint; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.MonitorFactory; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import org.apache.tuscany.sca.node.SCAClient; import org.apache.tuscany.sca.node.SCAContribution; import org.apache.tuscany.sca.node.SCANode; @@ -62,7 +62,7 @@ public class ReferenceWithoutTargetsTestCase extends TestCase { UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class); MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class); Monitor monitor = monitorFactory.createMonitor(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("ReferenceWithoutTargets", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ServiceNotFoundForComponentServiceTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ServiceNotFoundForComponentServiceTestCase.java index e9b920119a..b9bbd3fdd3 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ServiceNotFoundForComponentServiceTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ServiceNotFoundForComponentServiceTestCase.java @@ -27,7 +27,7 @@ import org.apache.tuscany.sca.core.UtilityExtensionPoint; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.MonitorFactory; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import org.apache.tuscany.sca.node.SCAClient; import org.apache.tuscany.sca.node.SCAContribution; import org.apache.tuscany.sca.node.SCANode; @@ -62,7 +62,7 @@ public class ServiceNotFoundForComponentServiceTestCase extends TestCase { UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class); MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class); Monitor monitor = monitorFactory.createMonitor(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("ServiceNotFoundForComponentService", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/UnresolvedComponentImplementationTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/UnresolvedComponentImplementationTestCase.java index 4d950e30ff..040adc09c7 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/UnresolvedComponentImplementationTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/UnresolvedComponentImplementationTestCase.java @@ -27,7 +27,7 @@ import org.apache.tuscany.sca.core.UtilityExtensionPoint; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.MonitorFactory; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import org.apache.tuscany.sca.node.SCAContribution; import org.apache.tuscany.sca.node.SCANode; import org.apache.tuscany.sca.node.SCANodeFactory; @@ -58,7 +58,7 @@ public class UnresolvedComponentImplementationTestCase extends TestCase { UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class); MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class); Monitor monitor = monitorFactory.createMonitor(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("UnresolvedComponentImplementation", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/contribution/java/AttributePackageMissingTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/contribution/java/AttributePackageMissingTestCase.java index 04135ab2cc..c306373ecb 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/contribution/java/AttributePackageMissingTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/contribution/java/AttributePackageMissingTestCase.java @@ -22,7 +22,7 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import domain.CustomCompositeBuilder; @@ -52,7 +52,7 @@ public class AttributePackageMissingTestCase extends TestCase { public void testCalculator() { Monitor monitor = customDomain.getMonitorInstance(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("AttributePackageMissing", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/contribution/namespace/AttributeNameSpaceMissingTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/contribution/namespace/AttributeNameSpaceMissingTestCase.java index ab0afc6f65..c412a16f24 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/contribution/namespace/AttributeNameSpaceMissingTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/contribution/namespace/AttributeNameSpaceMissingTestCase.java @@ -22,7 +22,7 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import domain.CustomCompositeBuilder; @@ -52,7 +52,7 @@ public class AttributeNameSpaceMissingTestCase extends TestCase { public void testCalculator() { Monitor monitor = customDomain.getMonitorInstance(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("AttributeNameSpaceMissing", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/contribution/resource/AttributeURIMissingTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/contribution/resource/AttributeURIMissingTestCase.java index b01ec2a254..05b0ee7771 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/contribution/resource/AttributeURIMissingTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/contribution/resource/AttributeURIMissingTestCase.java @@ -22,7 +22,7 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import domain.CustomCompositeBuilder; @@ -52,7 +52,7 @@ public class AttributeURIMissingTestCase extends TestCase { public void testCalculator() { Monitor monitor = customDomain.getMonitorInstance(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getProblems().get(2); + Problem problem = ((DefaultMonitorImpl)monitor).getProblems().get(2); assertNotNull(problem); assertEquals("AttributeURIMissing", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/contribution/xml/AttributeCompositeMissingTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/contribution/xml/AttributeCompositeMissingTestCase.java index 32c1a8b3a8..e966c5104a 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/contribution/xml/AttributeCompositeMissingTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/contribution/xml/AttributeCompositeMissingTestCase.java @@ -22,7 +22,7 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import domain.CustomCompositeBuilder; @@ -52,7 +52,7 @@ public class AttributeCompositeMissingTestCase extends TestCase { public void testCalculator() { Monitor monitor = customDomain.getMonitorInstance(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("AttributeCompositeMissing", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/contribution/xml/MultipleCompositeErrorsTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/contribution/xml/MultipleCompositeErrorsTestCase.java index 0a71ea06c7..28bc3af4e3 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/contribution/xml/MultipleCompositeErrorsTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/contribution/xml/MultipleCompositeErrorsTestCase.java @@ -22,7 +22,7 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import domain.CustomCompositeBuilder; @@ -54,7 +54,7 @@ public class MultipleCompositeErrorsTestCase extends TestCase { public void testCalculator() { Monitor monitor = customDomain.getMonitorInstance(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals(5, monitor.getProblems().size()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/AttributeUnrecognizedNamespaceTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/AttributeUnrecognizedNamespaceTestCase.java index 9d97e3611a..96bb9a7a35 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/AttributeUnrecognizedNamespaceTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/AttributeUnrecognizedNamespaceTestCase.java @@ -22,7 +22,7 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import domain.CustomCompositeBuilder; @@ -52,7 +52,7 @@ public class AttributeUnrecognizedNamespaceTestCase extends TestCase { public void testCalculator() { Monitor monitor = customDomain.getMonitorInstance(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("AttributeUnrecognizedNamespace", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/AttributeWithoutNamespaceTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/AttributeWithoutNamespaceTestCase.java index 80c15dc444..eb2eedb340 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/AttributeWithoutNamespaceTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/AttributeWithoutNamespaceTestCase.java @@ -22,7 +22,7 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import domain.CustomCompositeBuilder; @@ -52,7 +52,7 @@ public class AttributeWithoutNamespaceTestCase extends TestCase { public void testCalculator() { Monitor monitor = customDomain.getMonitorInstance(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("AttributeWithoutNamespace", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/BPELProcessNotFoundTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/BPELProcessNotFoundTestCase.java index 81e8aecfeb..e93918a94c 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/BPELProcessNotFoundTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/BPELProcessNotFoundTestCase.java @@ -22,7 +22,7 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import domain.CustomCompositeBuilder; @@ -52,7 +52,7 @@ public class BPELProcessNotFoundTestCase extends TestCase { public void testCalculator() { Monitor monitor = customDomain.getMonitorInstance(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("BPELProcessNotFound", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/CannotResolveWSDLReferenceTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/CannotResolveWSDLReferenceTestCase.java index fb0c525aea..2abfe45d24 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/CannotResolveWSDLReferenceTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/CannotResolveWSDLReferenceTestCase.java @@ -22,7 +22,7 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import domain.CustomCompositeBuilder; @@ -52,7 +52,7 @@ public class CannotResolveWSDLReferenceTestCase extends TestCase { public void testCalculator() { Monitor monitor = customDomain.getMonitorInstance(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("CannotResolveWSDLReference", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/MyRolePartnerRoleNullTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/MyRolePartnerRoleNullTestCase.java index 445629457e..b6c3b6c7c9 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/MyRolePartnerRoleNullTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/MyRolePartnerRoleNullTestCase.java @@ -22,7 +22,7 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import domain.CustomCompositeBuilder; @@ -52,7 +52,7 @@ public class MyRolePartnerRoleNullTestCase extends TestCase { public void testCalculator() { Monitor monitor = customDomain.getMonitorInstance(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("MyRolePartnerRoleNull", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/PartnerLinkHasBothAttrTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/PartnerLinkHasBothAttrTestCase.java index 00b904ae65..c623c2b157 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/PartnerLinkHasBothAttrTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/PartnerLinkHasBothAttrTestCase.java @@ -21,7 +21,7 @@ package impl.bpel; import junit.framework.TestCase; import org.apache.tuscany.sca.monitor.Monitor; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import domain.CustomCompositeBuilder; @@ -51,7 +51,7 @@ public class PartnerLinkHasBothAttrTestCase extends TestCase { public void testCalculator() { Monitor monitor = customDomain.getMonitorInstance(); - assertTrue(((DefaultLoggingMonitorImpl)monitor).isMessageLogged("PartnerLinkHasBothAttr")); + assertTrue(((DefaultMonitorImpl)monitor).isMessageLogged("PartnerLinkHasBothAttr")); /*Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("PartnerLinkHasBothAttr", problem.getMessageId());*/ diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/PartnerLinkNoMatchingTypeTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/PartnerLinkNoMatchingTypeTestCase.java index b7a4ee6fef..02a0de4724 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/PartnerLinkNoMatchingTypeTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/PartnerLinkNoMatchingTypeTestCase.java @@ -22,7 +22,7 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import domain.CustomCompositeBuilder; @@ -52,7 +52,7 @@ public class PartnerLinkNoMatchingTypeTestCase extends TestCase { public void testCalculator() { Monitor monitor = customDomain.getMonitorInstance(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("PartnerLinkNoMatchingType", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/PartnerLinkTypeNoRolesTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/PartnerLinkTypeNoRolesTestCase.java index 32d3211f36..d55c2a66b9 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/PartnerLinkTypeNoRolesTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/PartnerLinkTypeNoRolesTestCase.java @@ -21,7 +21,7 @@ package impl.bpel; import junit.framework.TestCase; import org.apache.tuscany.sca.monitor.Monitor; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import domain.CustomCompositeBuilder; @@ -51,7 +51,7 @@ public class PartnerLinkTypeNoRolesTestCase extends TestCase { public void testCalculator() { Monitor monitor = customDomain.getMonitorInstance(); - assertTrue(((DefaultLoggingMonitorImpl)monitor).isMessageLogged("PartnerLinkTypeNoRoles")); + assertTrue(((DefaultMonitorImpl)monitor).isMessageLogged("PartnerLinkTypeNoRoles")); /*Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("PartnerLinkTypeNoRoles", problem.getMessageId());*/ diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/ejb/EJBLinkAttributeMissingTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/impl/ejb/EJBLinkAttributeMissingTestCase.java index b31451c433..e0a3216d52 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/ejb/EJBLinkAttributeMissingTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/impl/ejb/EJBLinkAttributeMissingTestCase.java @@ -22,7 +22,7 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import domain.CustomCompositeBuilder; @@ -52,7 +52,7 @@ public class EJBLinkAttributeMissingTestCase extends TestCase { public void testCalculator() { Monitor monitor = customDomain.getMonitorInstance(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("EJBLinkAttributeMissing", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/java/ClassNotFoundExceptionTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/impl/java/ClassNotFoundExceptionTestCase.java index 3a7745722a..24d1c197a6 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/java/ClassNotFoundExceptionTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/impl/java/ClassNotFoundExceptionTestCase.java @@ -22,7 +22,7 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import domain.CustomCompositeBuilder; @@ -52,7 +52,7 @@ public class ClassNotFoundExceptionTestCase extends TestCase { public void testCalculator() { Monitor monitor = customDomain.getMonitorInstance(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("ClassNotFoundException", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/java/ContributionResolveExceptionTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/impl/java/ContributionResolveExceptionTestCase.java index 59fc3ce79c..e3e38e86c3 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/java/ContributionResolveExceptionTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/impl/java/ContributionResolveExceptionTestCase.java @@ -22,7 +22,7 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import domain.CustomCompositeBuilder; @@ -52,7 +52,7 @@ public class ContributionResolveExceptionTestCase extends TestCase { public void testCalculator() { Monitor monitor = customDomain.getMonitorInstance(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/osgi/CouldNotLocateOSGiBundleTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/impl/osgi/CouldNotLocateOSGiBundleTestCase.java index 6f54ad140c..b51403fec1 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/osgi/CouldNotLocateOSGiBundleTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/impl/osgi/CouldNotLocateOSGiBundleTestCase.java @@ -22,7 +22,7 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import org.apache.tuscany.sca.osgi.runtime.OSGiRuntime; import domain.CustomCompositeBuilder; @@ -56,7 +56,7 @@ public class CouldNotLocateOSGiBundleTestCase extends TestCase { public void testCalculator() { Monitor monitor = customDomain.getMonitorInstance(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("CouldNotLocateOSGiBundle", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/osgi/MissingComponentTypeFileTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/impl/osgi/MissingComponentTypeFileTestCase.java index 3d75fa8ccc..e6ee9d42fe 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/osgi/MissingComponentTypeFileTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/impl/osgi/MissingComponentTypeFileTestCase.java @@ -22,7 +22,7 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import org.apache.tuscany.sca.osgi.runtime.OSGiRuntime; import domain.CustomCompositeBuilder; @@ -56,7 +56,7 @@ public class MissingComponentTypeFileTestCase extends TestCase { public void testCalculator() { Monitor monitor = customDomain.getMonitorInstance(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("MissingComponentTypeFile", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/osgi/PropertyShouldSpecifySRTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/impl/osgi/PropertyShouldSpecifySRTestCase.java index 117a94337a..4a82f569de 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/osgi/PropertyShouldSpecifySRTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/impl/osgi/PropertyShouldSpecifySRTestCase.java @@ -22,7 +22,7 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import org.apache.tuscany.sca.osgi.runtime.OSGiRuntime; import domain.CustomCompositeBuilder; @@ -56,7 +56,7 @@ public class PropertyShouldSpecifySRTestCase extends TestCase { public void testCalculator() { Monitor monitor = customDomain.getMonitorInstance(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("PropertyShouldSpecifySR", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/resource/CouldNotResolveLocationTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/impl/resource/CouldNotResolveLocationTestCase.java index 14ba8e992e..5881d866a0 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/resource/CouldNotResolveLocationTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/impl/resource/CouldNotResolveLocationTestCase.java @@ -23,7 +23,7 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import domain.CustomCompositeBuilder; @@ -51,7 +51,7 @@ public class CouldNotResolveLocationTestCase extends TestCase { public void testCalculator() { Monitor monitor = customDomain.getMonitorInstance(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); Assert.assertNotNull(problem); Assert.assertEquals("CouldNotResolveLocation", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/resource/LocationAttributeMissingTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/impl/resource/LocationAttributeMissingTestCase.java index 461895f824..8fefaa05eb 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/resource/LocationAttributeMissingTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/impl/resource/LocationAttributeMissingTestCase.java @@ -22,7 +22,7 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import domain.CustomCompositeBuilder; @@ -52,7 +52,7 @@ public class LocationAttributeMissingTestCase extends TestCase { public void testCalculator() { Monitor monitor = customDomain.getMonitorInstance(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("LocationAttributeMissing", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/spring/ContributionResolveExceptionTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/impl/spring/ContributionResolveExceptionTestCase.java index 9b7dbef3dd..ebdd05d980 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/spring/ContributionResolveExceptionTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/impl/spring/ContributionResolveExceptionTestCase.java @@ -21,7 +21,7 @@ package impl.spring; import junit.framework.TestCase; import org.apache.tuscany.sca.monitor.Monitor; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import domain.CustomCompositeBuilder; @@ -51,7 +51,7 @@ public class ContributionResolveExceptionTestCase extends TestCase { public void testCalculator() { Monitor monitor = customDomain.getMonitorInstance(); - assertTrue(((DefaultLoggingMonitorImpl)monitor).isMessageLogged("ContributionResolveException")); + assertTrue(((DefaultMonitorImpl)monitor).isMessageLogged("ContributionResolveException")); //assertEquals("ContributionResolveException", problem.getMessageId()); } } diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/spring/LocationAttributeMissingTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/impl/spring/LocationAttributeMissingTestCase.java index cd38b53f66..7974aa5daf 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/spring/LocationAttributeMissingTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/impl/spring/LocationAttributeMissingTestCase.java @@ -22,7 +22,7 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import domain.CustomCompositeBuilder; @@ -52,7 +52,7 @@ public class LocationAttributeMissingTestCase extends TestCase { public void testCalculator() { Monitor monitor = customDomain.getMonitorInstance(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("LocationAttributeMissing", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/spring/UnableToResolveComponentTypeTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/impl/spring/UnableToResolveComponentTypeTestCase.java index 83550ae58d..0ad7bc0918 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/spring/UnableToResolveComponentTypeTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/impl/spring/UnableToResolveComponentTypeTestCase.java @@ -22,7 +22,7 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import domain.CustomCompositeBuilder; @@ -52,7 +52,7 @@ public class UnableToResolveComponentTypeTestCase extends TestCase { public void testCalculator() { Monitor monitor = customDomain.getMonitorInstance(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); //assertNotNull(problem); //assertEquals("UnableToResolveComponentType", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/widget/CouldNotResolveLocationTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/impl/widget/CouldNotResolveLocationTestCase.java index d098bb4bf8..3935afa79c 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/widget/CouldNotResolveLocationTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/impl/widget/CouldNotResolveLocationTestCase.java @@ -23,7 +23,7 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import domain.CustomCompositeBuilder; @@ -51,7 +51,7 @@ public class CouldNotResolveLocationTestCase extends TestCase { public void testCalculator() { Monitor monitor = customDomain.getMonitorInstance(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); Assert.assertNotNull(problem); Assert.assertEquals("CouldNotResolveLocation", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/widget/LocationAttributeMissingTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/impl/widget/LocationAttributeMissingTestCase.java index 2f85d8ed4a..daf8eab56f 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/widget/LocationAttributeMissingTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/impl/widget/LocationAttributeMissingTestCase.java @@ -22,7 +22,7 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import domain.CustomCompositeBuilder; @@ -52,7 +52,7 @@ public class LocationAttributeMissingTestCase extends TestCase { public void testCalculator() { Monitor monitor = customDomain.getMonitorInstance(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("LocationAttributeMissing", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/xquery/CouldNotLocateFileTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/impl/xquery/CouldNotLocateFileTestCase.java index f90fc3b83f..3dbbc61d9c 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/xquery/CouldNotLocateFileTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/impl/xquery/CouldNotLocateFileTestCase.java @@ -22,7 +22,7 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import domain.CustomCompositeBuilder; @@ -52,7 +52,7 @@ public class CouldNotLocateFileTestCase extends TestCase { public void testCalculator() { Monitor monitor = customDomain.getMonitorInstance(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("CouldNotLocateFile", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/xquery/LocationAttributeMissingTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/impl/xquery/LocationAttributeMissingTestCase.java index 01450a8836..584c11c061 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/xquery/LocationAttributeMissingTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/impl/xquery/LocationAttributeMissingTestCase.java @@ -22,7 +22,7 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import domain.CustomCompositeBuilder; @@ -52,7 +52,7 @@ public class LocationAttributeMissingTestCase extends TestCase { public void testCalculator() { Monitor monitor = customDomain.getMonitorInstance(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("LocationAttributeMissing", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/interfacejava/xml/ClassNotFoundTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/interfacejava/xml/ClassNotFoundTestCase.java index a03e056298..d941f41d2e 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/interfacejava/xml/ClassNotFoundTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/interfacejava/xml/ClassNotFoundTestCase.java @@ -22,7 +22,7 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import domain.CustomCompositeBuilder; @@ -52,7 +52,7 @@ public class ClassNotFoundTestCase extends TestCase { public void testCalculator() { Monitor monitor = customDomain.getMonitorInstance(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("ClassNotFoundException", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/interfacejava/xml/ContributionResolveExceptionTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/interfacejava/xml/ContributionResolveExceptionTestCase.java index e0524f57b7..0fb397011b 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/interfacejava/xml/ContributionResolveExceptionTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/interfacejava/xml/ContributionResolveExceptionTestCase.java @@ -22,7 +22,7 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import domain.CustomCompositeBuilder; @@ -52,7 +52,7 @@ public class ContributionResolveExceptionTestCase extends TestCase { public void testCalculator() { Monitor monitor = customDomain.getMonitorInstance(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); //assertNotNull(problem); //assertEquals("ContributionResolveException", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/interfacewsdl/xml/InvalidWSDLInterfaceAttrTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/interfacewsdl/xml/InvalidWSDLInterfaceAttrTestCase.java index e212477c61..f244ca7ec6 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/interfacewsdl/xml/InvalidWSDLInterfaceAttrTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/interfacewsdl/xml/InvalidWSDLInterfaceAttrTestCase.java @@ -22,7 +22,7 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import domain.CustomCompositeBuilder; @@ -52,7 +52,7 @@ public class InvalidWSDLInterfaceAttrTestCase extends TestCase { public void testCalculator() { Monitor monitor = customDomain.getMonitorInstance(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("InvalidWSDLInterfaceAttr", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/interfacewsdl/xml/WsdlInterfaceDoesNotMatchTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/interfacewsdl/xml/WsdlInterfaceDoesNotMatchTestCase.java index df2a2671df..2149942c25 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/interfacewsdl/xml/WsdlInterfaceDoesNotMatchTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/interfacewsdl/xml/WsdlInterfaceDoesNotMatchTestCase.java @@ -22,7 +22,7 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import domain.CustomCompositeBuilder; @@ -52,7 +52,7 @@ public class WsdlInterfaceDoesNotMatchTestCase extends TestCase { public void testCalculator() { Monitor monitor = customDomain.getMonitorInstance(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("WsdlInterfaceDoesNotMatch", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/AlwaysProvidedIntentNotFoundTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/AlwaysProvidedIntentNotFoundTestCase.java index 361e2f2bfb..1254f273b7 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/AlwaysProvidedIntentNotFoundTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/AlwaysProvidedIntentNotFoundTestCase.java @@ -22,7 +22,7 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import domain.CustomCompositeBuilder; @@ -52,7 +52,7 @@ public class AlwaysProvidedIntentNotFoundTestCase extends TestCase { public void testCalculator() { Monitor monitor = customDomain.getMonitorInstance(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("AlwaysProvidedIntentNotFound", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/ErrorInPolicyIntentDefinitionTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/ErrorInPolicyIntentDefinitionTestCase.java index a85dc334f4..150a9267c1 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/ErrorInPolicyIntentDefinitionTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/ErrorInPolicyIntentDefinitionTestCase.java @@ -22,7 +22,7 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import domain.CustomCompositeBuilder; @@ -52,7 +52,7 @@ public class ErrorInPolicyIntentDefinitionTestCase extends TestCase { public void testCalculator() { Monitor monitor = customDomain.getMonitorInstance(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("ErrorInPolicyIntentDefinition", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/IntentNotSpecifiedTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/IntentNotSpecifiedTestCase.java index 3f98757ce5..1e243689d6 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/IntentNotSpecifiedTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/IntentNotSpecifiedTestCase.java @@ -21,7 +21,7 @@ package policy.xml; import junit.framework.TestCase; import org.apache.tuscany.sca.monitor.Monitor; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import domain.CustomCompositeBuilder; @@ -51,7 +51,7 @@ public class IntentNotSpecifiedTestCase extends TestCase { public void testCalculator() { Monitor monitor = customDomain.getMonitorInstance(); - assertTrue(((DefaultLoggingMonitorImpl)monitor).isMessageLogged("IntentNotSpecified")); + assertTrue(((DefaultMonitorImpl)monitor).isMessageLogged("IntentNotSpecified")); /*Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("IntentNotSpecified", problem.getMessageId());*/ diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/MayProvideIntentNotFoundTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/MayProvideIntentNotFoundTestCase.java index 3b8d075165..f2b0b7222f 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/MayProvideIntentNotFoundTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/MayProvideIntentNotFoundTestCase.java @@ -22,7 +22,7 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import domain.CustomCompositeBuilder; @@ -52,7 +52,7 @@ public class MayProvideIntentNotFoundTestCase extends TestCase { public void testCalculator() { Monitor monitor = customDomain.getMonitorInstance(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("MayProvideIntentNotFound", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/RequiredAttributeMissingTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/RequiredAttributeMissingTestCase.java index bcf1f82392..e5aba5b481 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/RequiredAttributeMissingTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/RequiredAttributeMissingTestCase.java @@ -22,7 +22,7 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import domain.CustomCompositeBuilder; @@ -52,7 +52,7 @@ public class RequiredAttributeMissingTestCase extends TestCase { public void testCalculator() { Monitor monitor = customDomain.getMonitorInstance(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("RequiredAttributeMissing", problem.getMessageId()); diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/UnableToMapPoliciesTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/UnableToMapPoliciesTestCase.java index 5683d54e64..5bfc77d267 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/UnableToMapPoliciesTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/UnableToMapPoliciesTestCase.java @@ -21,7 +21,7 @@ package policy.xml; import junit.framework.TestCase; import org.apache.tuscany.sca.monitor.Monitor; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import org.junit.Ignore; import domain.CustomCompositeBuilder; diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/UnrecognizedIntentAttachPointTypeTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/UnrecognizedIntentAttachPointTypeTestCase.java index eec39d711e..64b527e131 100644 --- a/branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/UnrecognizedIntentAttachPointTypeTestCase.java +++ b/branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/UnrecognizedIntentAttachPointTypeTestCase.java @@ -22,7 +22,7 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; import domain.CustomCompositeBuilder; @@ -52,7 +52,7 @@ public class UnrecognizedIntentAttachPointTypeTestCase extends TestCase { public void testCalculator() { Monitor monitor = customDomain.getMonitorInstance(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); assertNotNull(problem); assertEquals("UnrecognizedIntentAttachPointType", problem.getMessageId()); diff --git a/branches/sca-java-1.x/modules/domain-manager/pom.xml b/branches/sca-java-1.x/modules/domain-manager/pom.xml index 5a526b158a..6ca199de11 100644 --- a/branches/sca-java-1.x/modules/domain-manager/pom.xml +++ b/branches/sca-java-1.x/modules/domain-manager/pom.xml @@ -180,9 +180,8 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-monitor-logging</artifactId> + <artifactId>tuscany-monitor</artifactId> <version>1.4-SNAPSHOT</version> - <scope>runtime</scope> </dependency> </dependencies> diff --git a/branches/sca-java-1.x/modules/endpoint/pom.xml b/branches/sca-java-1.x/modules/endpoint/pom.xml index 31e8adc800..9895491988 100644 --- a/branches/sca-java-1.x/modules/endpoint/pom.xml +++ b/branches/sca-java-1.x/modules/endpoint/pom.xml @@ -86,7 +86,7 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-monitor-logging</artifactId> + <artifactId>tuscany-monitor</artifactId> <version>1.4-SNAPSHOT</version> <scope>test</scope> </dependency> diff --git a/branches/sca-java-1.x/modules/monitor-logging/LICENSE b/branches/sca-java-1.x/modules/monitor-logging/LICENSE deleted file mode 100644 index 8aa906c321..0000000000 --- a/branches/sca-java-1.x/modules/monitor-logging/LICENSE +++ /dev/null @@ -1,205 +0,0 @@ - - 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, service 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. - - - diff --git a/branches/sca-java-1.x/modules/monitor-logging/NOTICE b/branches/sca-java-1.x/modules/monitor-logging/NOTICE deleted file mode 100644 index fdfa0e9faa..0000000000 --- a/branches/sca-java-1.x/modules/monitor-logging/NOTICE +++ /dev/null @@ -1,6 +0,0 @@ -${pom.name} -Copyright (c) 2005 - 2008 The Apache Software Foundation - -This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). - diff --git a/branches/sca-java-1.x/modules/monitor-logging/pom.xml b/branches/sca-java-1.x/modules/monitor-logging/pom.xml deleted file mode 100644 index 32dd2fc235..0000000000 --- a/branches/sca-java-1.x/modules/monitor-logging/pom.xml +++ /dev/null @@ -1,68 +0,0 @@ -<?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> - - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-modules</artifactId> - <version>1.4-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <artifactId>tuscany-monitor-logging</artifactId> - <name>Apache Tuscany SCA Monitor Default Logging Implementation</name> - - <dependencies> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-monitor</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-assembly</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - - </dependencies> - - - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - - <configuration> - <instructions> - <Bundle-Version>${tuscany.version}</Bundle-Version> - <Bundle-SymbolicName>org.apache.tuscany.sca.monitor.logging</Bundle-SymbolicName> - <Bundle-Description>${pom.name}</Bundle-Description> - <Export-Package>org.apache.tuscany.sca.monitor*</Export-Package> - </instructions> - </configuration> - </plugin> - </plugins> - </build> - -</project> diff --git a/branches/sca-java-1.x/modules/monitor-logging/src/main/java/org/apache/tuscany/sca/monitor/logging/impl/DefaultLoggingMonitorImpl.java b/branches/sca-java-1.x/modules/monitor-logging/src/main/java/org/apache/tuscany/sca/monitor/logging/impl/DefaultLoggingMonitorImpl.java deleted file mode 100644 index 8a9701b8fc..0000000000 --- a/branches/sca-java-1.x/modules/monitor-logging/src/main/java/org/apache/tuscany/sca/monitor/logging/impl/DefaultLoggingMonitorImpl.java +++ /dev/null @@ -1,104 +0,0 @@ -/* - * 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.sca.monitor.logging.impl; - -import java.util.ArrayList; -import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; - -import org.apache.tuscany.sca.monitor.Monitor; -import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.Problem.Severity; - - -/** - * A monitor for the watching for validation problems - * - * @version $Rev$ $Date$ - */ -public class DefaultLoggingMonitorImpl implements Monitor { - private static final Logger logger = Logger.getLogger(DefaultLoggingMonitorImpl.class.getName()); - - // Cache all the problem reported to monitor for further analysis - private List<Problem> problemCache = new ArrayList<Problem>(); - - public void problem(Problem problem) { - - Logger problemLogger = Logger.getLogger(problem.getSourceClassName(), problem.getBundleName()); - - if (problemLogger == null){ - logger.severe("Can't get logger " + problem.getSourceClassName()+ " with bundle " + problem.getBundleName()); - } - - if (problem.getSeverity() == Severity.INFO) { - problemCache.add(problem); - problemLogger.logp(Level.INFO, problem.getSourceClassName(), null, - problem.getMessageId(), problem.getMessageParams()); - } - else if (problem.getSeverity() == Severity.WARNING) { - problemCache.add(problem); - problemLogger.logp(Level.WARNING, problem.getSourceClassName(), null, - problem.getMessageId(), problem.getMessageParams()); - } - else if (problem.getSeverity() == Severity.ERROR) { - if (problem.getCause() != null) { - problemCache.add(problem); - problemLogger.logp(Level.SEVERE, problem.getSourceClassName(), - null, problem.getMessageId(), problem.getCause().toString()); - } else { - problemCache.add(problem); - problemLogger.logp(Level.SEVERE, problem.getSourceClassName(), null, - problem.getMessageId(), problem.getMessageParams()); - } - } - } - - public List<Problem> getProblems(){ - return problemCache; - } - - public Problem getLastLoggedProblem() { - if (problemCache.isEmpty()) { - return null; - } - return problemCache.get(problemCache.size() - 1); - } - - public boolean isMessageLogged(String messageId) { - for (Problem problem : problemCache){ - if (problem.getMessageId().equals(messageId)){ - return true; - } - } - - return false; - } - - public Problem getProblem(String messageId) { - for (Problem problem : problemCache){ - if (problem.getMessageId().equals(messageId)){ - return problem; - } - } - - return null; - } -} diff --git a/branches/sca-java-1.x/modules/monitor-logging/src/main/java/org/apache/tuscany/sca/monitor/logging/impl/MonitorFactoryImpl.java b/branches/sca-java-1.x/modules/monitor-logging/src/main/java/org/apache/tuscany/sca/monitor/logging/impl/MonitorFactoryImpl.java deleted file mode 100644 index a3162a3267..0000000000 --- a/branches/sca-java-1.x/modules/monitor-logging/src/main/java/org/apache/tuscany/sca/monitor/logging/impl/MonitorFactoryImpl.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * 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.sca.monitor.logging.impl; - -import org.apache.tuscany.sca.monitor.Monitor; -import org.apache.tuscany.sca.monitor.MonitorFactory; - - -/** - * A factory for creating validation monitors - * - * @version $Rev$ $Date$ - */ -public class MonitorFactoryImpl implements MonitorFactory { - - private Monitor monitor = null; - - public Monitor createMonitor() { - if (monitor == null){ - monitor = new DefaultLoggingMonitorImpl(); - } - return monitor ; - } -} diff --git a/branches/sca-java-1.x/modules/monitor-logging/src/test/java/org/apache/tuscany/sca/monitor/MonitorTestCase.java b/branches/sca-java-1.x/modules/monitor-logging/src/test/java/org/apache/tuscany/sca/monitor/MonitorTestCase.java deleted file mode 100644 index c5fa6c4da6..0000000000 --- a/branches/sca-java-1.x/modules/monitor-logging/src/test/java/org/apache/tuscany/sca/monitor/MonitorTestCase.java +++ /dev/null @@ -1,94 +0,0 @@ -/* - * 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.sca.monitor; - -import org.apache.tuscany.sca.assembly.builder.impl.ProblemImpl; -import org.apache.tuscany.sca.monitor.Problem.Severity; -import org.apache.tuscany.sca.monitor.logging.impl.MonitorFactoryImpl; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -/** - * Loads a monitor and adds some problems to it. - * - * @version $Rev$ $Date$ - */ -public class MonitorTestCase { - - private static MonitorFactory monitorFactory; - - @BeforeClass - public static void init() throws Exception { - monitorFactory = new MonitorFactoryImpl(); - } - - @AfterClass - public static void destroy() throws Exception { - monitorFactory = null; - } - - @Test - public void testCreateProblem() throws Exception { - String dummyModelObject = "DUMMY MODEL OBJECT"; - - Monitor monitor = monitorFactory.createMonitor(); - - Problem problem = null; - - problem = new ProblemImpl(this.getClass().getName(), - "tuscany-monitor-test-messages", - Severity.WARNING, - dummyModelObject, - "MESSAGE1" ); - monitor.problem(problem); - - String param = "Some Parameter"; - - problem = new ProblemImpl(this.getClass().getName(), - "tuscany-monitor-test-messages", - Severity.WARNING, - dummyModelObject, - "MESSAGE2", - param); - monitor.problem(problem); - - problem = new ProblemImpl(this.getClass().getName(), - "tuscany-monitor-test-messages", - Severity.WARNING, - dummyModelObject, - "MESSAGE3", - 8, - 9, - 4); - monitor.problem(problem); - - Exception ex = new IllegalStateException("TEST_MESSAGE"); - - problem = new ProblemImpl(this.getClass().getName(), - "tuscany-monitor-test-messages", - Severity.ERROR, - dummyModelObject, - "MESSAGE4", - ex); - monitor.problem(problem); - - } -} diff --git a/branches/sca-java-1.x/modules/monitor-logging/src/test/resources/tuscany-monitor-test-messages.properties b/branches/sca-java-1.x/modules/monitor-logging/src/test/resources/tuscany-monitor-test-messages.properties deleted file mode 100644 index 523263da40..0000000000 --- a/branches/sca-java-1.x/modules/monitor-logging/src/test/resources/tuscany-monitor-test-messages.properties +++ /dev/null @@ -1,24 +0,0 @@ -# -# -# 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. -# -# -MESSAGE1 = This is a test message with no params -MESSAGE2 = This is a test message with a string param {0} -MESSAGE3 = This is a test message with numbers {0}, {1}, {2} -MESSAGE4 = This is a test message with exception diff --git a/branches/sca-java-1.x/modules/monitor-logging/src/test/resources/tuscany-monitor-test-messages_it.properties b/branches/sca-java-1.x/modules/monitor-logging/src/test/resources/tuscany-monitor-test-messages_it.properties deleted file mode 100644 index 523263da40..0000000000 --- a/branches/sca-java-1.x/modules/monitor-logging/src/test/resources/tuscany-monitor-test-messages_it.properties +++ /dev/null @@ -1,24 +0,0 @@ -# -# -# 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. -# -# -MESSAGE1 = This is a test message with no params -MESSAGE2 = This is a test message with a string param {0} -MESSAGE3 = This is a test message with numbers {0}, {1}, {2} -MESSAGE4 = This is a test message with exception diff --git a/branches/sca-java-1.x/modules/monitor-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.monitor.MonitorFactory b/branches/sca-java-1.x/modules/monitor/src/main/resources/META-INF/services/org.apache.tuscany.sca.monitor.MonitorFactory index b46d552fb5..0212a69382 100644 --- a/branches/sca-java-1.x/modules/monitor-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.monitor.MonitorFactory +++ b/branches/sca-java-1.x/modules/monitor/src/main/resources/META-INF/services/org.apache.tuscany.sca.monitor.MonitorFactory @@ -15,4 +15,4 @@ # specific language governing permissions and limitations
# under the License.
-org.apache.tuscany.sca.monitor.logging.impl.MonitorFactoryImpl
+org.apache.tuscany.sca.monitor.impl.DefaultMonitorFactoryImpl
diff --git a/branches/sca-java-1.x/modules/pom.xml b/branches/sca-java-1.x/modules/pom.xml index 0a228011f9..84cdaf4ea0 100644 --- a/branches/sca-java-1.x/modules/pom.xml +++ b/branches/sca-java-1.x/modules/pom.xml @@ -155,7 +155,6 @@ <module>implementation-widget-runtime</module> <module>implementation-xquery</module> <module>monitor</module> - <module>monitor-logging</module> <module>node-api</module> <module>node-dynamic</module> <module>node-impl</module> diff --git a/branches/sca-java-1.x/modules/runtime2/pom.xml b/branches/sca-java-1.x/modules/runtime2/pom.xml index dbf55df4e3..a17c5613fb 100644 --- a/branches/sca-java-1.x/modules/runtime2/pom.xml +++ b/branches/sca-java-1.x/modules/runtime2/pom.xml @@ -115,11 +115,6 @@ <artifactId>tuscany-monitor</artifactId>
<version>1.4-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-monitor-logging</artifactId>
- <version>1.4-SNAPSHOT</version>
- </dependency>
</dependencies>
diff --git a/branches/sca-java-1.x/samples/domain-webapp/build.xml b/branches/sca-java-1.x/samples/domain-webapp/build.xml index e008e3c9f0..c8bbf1e8d3 100644 --- a/branches/sca-java-1.x/samples/domain-webapp/build.xml +++ b/branches/sca-java-1.x/samples/domain-webapp/build.xml @@ -118,7 +118,7 @@ <pathelement location="${m2.repo}\com\metaparadigm\json-rpc\1.0\json-rpc-1.0.jar"/>
<pathelement location="${m2.repo}\commons-codec\commons-codec\1.3\commons-codec-1.3.jar"/>
<pathelement location="${m2.repo}\commons-fileupload\commons-fileupload\1.1.1\commons-fileupload-1.1.1.jar"/>
- <pathelement location="${m2.repo}\commons-httpclient\commons-httpclient\3.0.1\commons-httpclient-3.0.1.jar"/>
+ <pathelement location="${m2.repo}\commons-httpclient\commons-httpclient\3.0.1\commons-httpclient-3.1.jar"/>
<pathelement location="${m2.repo}\commons-io\commons-io\1.1\commons-io-1.1.jar"/>
<pathelement location="${m2.repo}\commons-logging\commons-logging\1.1\commons-logging-1.1.jar"/>
<pathelement location="${m2.repo}\javax\activation\activation\1.1\activation-1.1.jar"/>
diff --git a/branches/sca-java-1.x/samples/helloworld-ws-deep-webapp/build.xml b/branches/sca-java-1.x/samples/helloworld-ws-deep-webapp/build.xml index bdb341d26a..be81d0a9bb 100644 --- a/branches/sca-java-1.x/samples/helloworld-ws-deep-webapp/build.xml +++ b/branches/sca-java-1.x/samples/helloworld-ws-deep-webapp/build.xml @@ -111,7 +111,7 @@ <include name="common-2.2.3.jar"/>
<include name="commons-codec-1.3.jar"/>
<include name="commons-fileupload-1.1.1.jar"/>
- <include name="commons-httpclient-3.0.1.jar"/>
+ <include name="commons-httpclient-3.1.jar"/>
<include name="commons-io-1.1.jar"/>
<include name="commons-logging-1.1.jar"/>
<include name="ecore-2.2.3.jar"/>
diff --git a/branches/sca-java-1.x/samples/helloworld-ws-service-webapp/build.xml b/branches/sca-java-1.x/samples/helloworld-ws-service-webapp/build.xml index ff850203b3..427772d2a1 100644 --- a/branches/sca-java-1.x/samples/helloworld-ws-service-webapp/build.xml +++ b/branches/sca-java-1.x/samples/helloworld-ws-service-webapp/build.xml @@ -108,7 +108,7 @@ <include name="common-2.2.3.jar"/>
<include name="commons-codec-1.3.jar"/>
<include name="commons-fileupload-1.1.1.jar"/>
- <include name="commons-httpclient-3.0.1.jar"/>
+ <include name="commons-httpclient-3.1.jar"/>
<include name="commons-io-1.1.jar"/>
<include name="commons-logging-1.1.jar"/>
<include name="ecore-2.2.3.jar"/>
@@ -144,7 +144,8 @@ </lib>
<classes dir="target/classes"/>
<classes dir="target/sdo-source"/>
- </war>
</target>
+ </war>
+ </target>
<target name="package" depends="compile"/>
diff --git a/branches/sca-java-1.x/samples/simple-bigbank-spring/pom.xml b/branches/sca-java-1.x/samples/simple-bigbank-spring/pom.xml index 675510350a..62e87b5831 100644 --- a/branches/sca-java-1.x/samples/simple-bigbank-spring/pom.xml +++ b/branches/sca-java-1.x/samples/simple-bigbank-spring/pom.xml @@ -70,7 +70,7 @@ <dependency> <groupId>commons-httpclient</groupId> <artifactId>commons-httpclient</artifactId> - <version>3.0.1</version> + <version>3.1</version> </dependency> <dependency> |