You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by ks...@apache.org on 2009/10/12 21:59:19 UTC
svn commit: r824479 [4/4] - in /webservices/juddi/trunk: ./
docs/examples/appserver/jboss/ docs/examples/helloworld/META-INF/
juddi-client/ juddi-client/src/ juddi-client/src/main/
juddi-client/src/main/java/ juddi-client/src/main/java/org/ juddi-clien...
Modified: webservices/juddi/trunk/uddi-tck/pom.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-tck/pom.xml?rev=824479&r1=824478&r2=824479&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-tck/pom.xml (original)
+++ webservices/juddi/trunk/uddi-tck/pom.xml Mon Oct 12 19:59:15 2009
@@ -1,82 +1,265 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- * Copyright 2001-2009 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */ -->
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <parent>
- <groupId>org.apache.juddi</groupId>
- <artifactId>juddi-parent</artifactId>
- <version>3.0.0.SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.juddi</groupId>
- <artifactId>uddi-tck</artifactId>
- <version>3.0.0.SNAPSHOT</version>
- <name>UDDI Technical Compatibility Kit (TCK)</name>
- <packaging>jar</packaging>
- <repositories>
- <repository>
- <id>maven2-repository.dev.java.net</id>
- <name>Java.net Maven 2 Repository</name>
- <url>http://download.java.net/maven/2</url>
- <layout>default</layout>
- </repository>
- <repository>
- <id>maven-repository.dev.java.net</id>
- <name>Java.net Maven 1 Repository (legacy)</name>
- <url>http://download.java.net/maven/1</url>
- <layout>legacy</layout>
- </repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>maven2-repository.dev.java.net</id>
- <url>http://download.java.net/maven/2</url>
- </pluginRepository>
- <pluginRepository>
- <id>maven-repository.dev.java.net</id>
- <url>http://download.java.net/maven/1</url>
- <layout>legacy</layout>
- </pluginRepository>
- </pluginRepositories>
- <dependencies>
- <dependency>
- <groupId>org.apache.juddi</groupId>
- <artifactId>uddi-ws</artifactId>
- <version>3.0.0.SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.13</version>
- </dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.1</version>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.3</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.5</version>
- </dependency>
- </dependencies>
+ * Copyright 2001-2009 The Apache Software Foundation. * * Licensed
+ under the Apache License, Version 2.0 (the "License"); * you may not
+ use this file except in compliance with the License. * You may obtain
+ a copy of the License at * *
+ http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by
+ applicable law or agreed to in writing, software * distributed under
+ the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES
+ OR CONDITIONS OF ANY KIND, either express or implied. * See the
+ License for the specific language governing permissions and *
+ limitations under the License. * */
+ -->
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <parent>
+ <groupId>org.apache.juddi</groupId>
+ <artifactId>juddi-parent</artifactId>
+ <version>3.0.0.SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.juddi</groupId>
+ <artifactId>uddi-tck</artifactId>
+ <version>3.0.0.SNAPSHOT</version>
+ <name>UDDI TCK Tests</name>
+ <packaging>jar</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.juddi</groupId>
+ <artifactId>uddi-ws</artifactId>
+ <version>3.0.0.SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ <version>1.5</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.13</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.5</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.juddi</groupId>
+ <artifactId>uddi-tck-base</artifactId>
+ <version>3.0.0.SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.juddi</groupId>
+ <artifactId>juddi-core</artifactId>
+ <version>3.0.0.SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.juddi</groupId>
+ <artifactId>juddi-client</artifactId>
+ <version>3.0.0.SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.juddi</groupId>
+ <artifactId>juddi-tomcat</artifactId>
+ <version>3.0.0.SNAPSHOT</version>
+ <type>zip</type>
+ <scope>test</scope>
+ </dependency>
+ <!-- for RMI
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jbossall-client</artifactId>
+ <version>4.2.2.GA</version>
+ <scope>test</scope>
+ </dependency>
+ -->
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.1</version>
+ <executions>
+ <execution>
+ <id>copy</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.juddi</groupId>
+ <artifactId>juddi-tomcat</artifactId>
+ <version>3.0.0.SNAPSHOT</version>
+ <type>zip</type>
+ <outputDirectory>${basedir}/target</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.3</version>
+ <executions>
+ <execution>
+ <id>test</id>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <tasks>
+ <unzip dest="target" src="target/juddi-tomcat-3.0.0.SNAPSHOT.zip" />
+ <copy file="${basedir}/server.xml" todir="target/juddi-tomcat-${project.version}/conf" overwrite="true"/>
+ <copy file="${basedir}/log4j.properties" todir="target/juddi-tomcat-${project.version}/webapps/juddiv3/WEB-INF/classes" overwrite="true"/>
+ <!--
+ <copy file="${basedir}/log4j.xml" todir="target/juddi-tomcat-${project.version}/webapps/juddiv3/log4j.xml"/>
+ -->
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-maven2-plugin</artifactId>
+ <version>1.0</version>
+ <configuration>
+ <wait>false</wait>
+ <container>
+ <containerId>tomcat6x</containerId>
+ <home>${basedir}/target/juddi-tomcat-3.0.0.SNAPSHOT</home>
+ </container>
+ <configuration>
+ <type>existing</type>
+ <home>${project.build.directory}/juddi-tomcat-3.0.0.SNAPSHOT</home>
+ <properties>
+ <cargo.hostname>localhost</cargo.hostname>
+ <cargo.servlet.port>8880</cargo.servlet.port>
+ <cargo.jvmargs>-Xmx128m</cargo.jvmargs>
+ </properties>
+ </configuration>
+ </configuration>
+ <executions>
+ <execution>
+ <id>start-container</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>start</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>stop-container</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>stop</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4</version>
+ <configuration>
+ <skip>true</skip>
+ <includes>
+ <include>**/*IntegrationTest.java</include>
+ </includes>
+ <systemProperties>
+ <property>
+ <name>derby.stream.error.file</name>
+ <value>target/derby.log</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ <executions>
+ <execution>
+ <id>surefire-it</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <skip>false</skip>
+ <systemProperties>
+ <property>
+ <name>cactus.contextURL</name>
+ <value>http://localhost:8880/juddi</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <profiles>
+ <profile>
+ <id>load</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4</version>
+ <configuration>
+ <skip>true</skip>
+ <includes>
+ <include>**/*LoadTest.java</include>
+ </includes>
+ <systemProperties>
+ <property>
+ <name>derby.stream.error.file</name>
+ <value>target/derby.log</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ <executions>
+ <execution>
+ <id>surefire-it</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <skip>false</skip>
+ <systemProperties>
+ <property>
+ <name>cactus.contextURL</name>
+ <value>http://localhost:8880/juddi</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Added: webservices/juddi/trunk/uddi-tck/src/main/resources/META-INF/uddi.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-tck/src/main/resources/META-INF/uddi.xml?rev=824479&view=auto
==============================================================================
--- webservices/juddi/trunk/uddi-tck/src/main/resources/META-INF/uddi.xml (added)
+++ webservices/juddi/trunk/uddi-tck/src/main/resources/META-INF/uddi.xml Mon Oct 12 19:59:15 2009
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+
+<uddi>
+ <reloadDelay>5000</reloadDelay>
+ <manager name="test-manager">
+ <nodes>
+ <node>
+ <!-- required 'default' node -->
+ <name>default</name>
+ <description>Main jUDDI node</description>
+ <properties>
+ <property name="serverName" value="localhost" />
+ <property name="serverPort" value="8880" />
+ </properties>
+ <!-- JAX-WS Transport -->
+ <proxyTransport>org.apache.juddi.v3.client.transport.JAXWSTransport</proxyTransport>
+ <custodyTransferUrl>http://${serverName}:${serverPort}/juddiv3/services/custody-transfer?wsdl</custodyTransferUrl>
+ <inquiryUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiry?wsdl</inquiryUrl>
+ <publishUrl>http://${serverName}:${serverPort}/juddiv3/services/publish?wsdl</publishUrl>
+ <securityUrl>http://${serverName}:${serverPort}/juddiv3/services/security?wsdl</securityUrl>
+ <subscriptionUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription?wsdl</subscriptionUrl>
+ <subscriptionListenerUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription-listener?wsdl</subscriptionListenerUrl>
+ <juddiApiUrl>http://${serverName}:${serverPort}/juddiv3/services/juddi-api?wsdl</juddiApiUrl>
+ <!-- In VM Transport Settings
+ <proxyTransport>org.apache.juddi.v3.client.transport.InVMTransport</proxyTransport>
+ <custodyTransferUrl>org.apache.juddi.api.impl.UDDICustodyTransferImpl</custodyTransferUrl>
+ <inquiryUrl>org.apache.juddi.api.impl.UDDIInquiryImpl</inquiryUrl>
+ <publishUrl>org.apache.juddi.api.impl.UDDIPublicationImpl</publishUrl>
+ <securityUrl>org.apache.juddi.api.impl.UDDISecurityImpl</securityUrl>
+ <subscriptionUrl>org.apache.juddi.api.impl.UDDISubscriptionImpl</subscriptionUrl>
+ <subscriptionListenerUrl>org.apache.juddi.api.impl.UDDISubscriptionListenerImpl</subscriptionListenerUrl>
+ <juddiApiUrl>org.apache.juddi.api.impl.JUDDIApiImpl</juddiApiUrl>
+ -->
+ <!-- RMI Transport Settings
+ <proxyTransport>org.apache.juddi.v3.client.transport.RMITransport</proxyTransport>
+ <custodyTransferUrl>/juddiv3/UDDICustodyTransferService</custodyTransferUrl>
+ <inquiryUrl>/juddiv3/UDDIInquiryService</inquiryUrl>
+ <publishUrl>/juddiv3/UDDIPublicationService</publishUrl>
+ <securityUrl>/juddiv3/UDDISecurityService</securityUrl>
+ <subscriptionUrl>/juddiv3/UDDISubscriptionService</subscriptionUrl>
+ <subscriptionListenerUrl>/juddiv3/UDDISubscriptionListenerService</subscriptionListenerUrl>
+ <juddiApiUrl>/juddiv3/JUDDIApiService</juddiApiUrl>
+ <javaNamingFactoryInitial>org.jnp.interfaces.NamingContextFactory</javaNamingFactoryInitial>
+ <javaNamingFactoryUrlPkgs>org.jboss.naming</javaNamingFactoryUrlPkgs>
+ <javaNamingProviderUrl>jnp://localhost:1099</javaNamingProviderUrl>
+ -->
+ </node>
+ <node>
+ <name>med</name>
+ <description>jUDDI node in other Department</description>
+ <proxyTransport>org.apache.juddi.v3.client.transport.JAXWSTransport</proxyTransport>
+ <custodyTransferUrl>http://med:8080/juddiv3/services/custody-transfer?wsdl</custodyTransferUrl>
+ <inquiryUrl>http://med:8080/juddiv3/services/inquiry?wsdl</inquiryUrl>
+ <publishUrl>http://med:8080/juddiv3/services/publish?wsdl</publishUrl>
+ <securityUrl>http://med:8080/juddiv3/services/security?wsdl</securityUrl>
+ <subscriptionUrl>http://med:8080/juddiv3/services/subscription?wsdl</subscriptionUrl>
+ <subscriptionListenerUrl>http://med:8080/juddiv3/services/subscription-listener?wsdl</subscriptionListenerUrl>
+ <juddiApiUrl>http://med:8080/juddiv3/services/juddi-api?wsdl</juddiApiUrl>
+ </node>
+ </nodes>
+ <clerks registerOnStartup="false">
+ <clerk name="default" node="default" publisher="root" password="root"/>
+ <clerk name="medroot" node="med" publisher="root" password="root"/>
+ <xregister>
+ <service bindingKey="uddi:juddi.apache.org:servicebindings-subscriptionlistener-ws" fromClerk="default" toClerk="medroot"/>
+ </xregister>
+ <subscription subscriptionKey=" " clerk="medroot" />
+ </clerks>
+ </manager>
+</uddi>
\ No newline at end of file
Copied: webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_010_PublisherIntegrationTest.java (from r823926, webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/JUDDI_010_PublisherIntegrationTest.java)
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_010_PublisherIntegrationTest.java?p2=webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_010_PublisherIntegrationTest.java&p1=webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/JUDDI_010_PublisherIntegrationTest.java&r1=823926&r2=824479&rev=824479&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/JUDDI_010_PublisherIntegrationTest.java (original)
+++ webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_010_PublisherIntegrationTest.java Mon Oct 12 19:59:15 2009
@@ -12,7 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juddi.v3.client;
+package org.apache.juddi.v3.tck;
import static junit.framework.Assert.assertEquals;
@@ -32,10 +32,10 @@
import org.apache.juddi.config.AppConfig;
import org.apache.juddi.config.Property;
import org.apache.juddi.error.InvalidKeyPassedException;
+import org.apache.juddi.jaxb.EntityCreator;
import org.apache.juddi.v3.client.config.UDDIClerkManager;
import org.apache.juddi.v3.client.transport.InVMTransport;
import org.apache.juddi.v3.client.transport.Transport;
-import org.apache.juddi.v3.tck.EntityCreator;
import org.apache.juddi.v3.tck.TckPublisher;
import org.apache.juddi.v3.tck.TckSecurity;
import org.apache.juddi.v3_service.JUDDIApiPortType;
Propchange: webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_010_PublisherIntegrationTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Oct 12 19:59:15 2009
@@ -0,0 +1 @@
+/webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/JUDDI_010_PublisherIntegrationTest.java:797614-802957
Copied: webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_010_PublisherIntegrationTest.java (from r823926, webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_010_PublisherIntegrationTest.java)
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_010_PublisherIntegrationTest.java?p2=webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_010_PublisherIntegrationTest.java&p1=webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_010_PublisherIntegrationTest.java&r1=823926&r2=824479&rev=824479&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_010_PublisherIntegrationTest.java (original)
+++ webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_010_PublisherIntegrationTest.java Mon Oct 12 19:59:15 2009
@@ -12,7 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juddi.v3.client;
+package org.apache.juddi.v3.tck;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.juddi.Registry;
Copied: webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_020_TmodelIntegrationTest.java (from r823926, webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_020_TmodelIntegrationTest.java)
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_020_TmodelIntegrationTest.java?p2=webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_020_TmodelIntegrationTest.java&p1=webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_020_TmodelIntegrationTest.java&r1=823926&r2=824479&rev=824479&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_020_TmodelIntegrationTest.java (original)
+++ webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_020_TmodelIntegrationTest.java Mon Oct 12 19:59:15 2009
@@ -12,7 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juddi.v3.client;
+package org.apache.juddi.v3.tck;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.juddi.Registry;
Copied: webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityIntegrationTest.java (from r823926, webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_030_BusinessEntityIntegrationTest.java)
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityIntegrationTest.java?p2=webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityIntegrationTest.java&p1=webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_030_BusinessEntityIntegrationTest.java&r1=823926&r2=824479&rev=824479&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_030_BusinessEntityIntegrationTest.java (original)
+++ webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityIntegrationTest.java Mon Oct 12 19:59:15 2009
@@ -12,7 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juddi.v3.client;
+package org.apache.juddi.v3.tck;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.juddi.Registry;
Copied: webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityLoadTest.java (from r823926, webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_030_BusinessEntityLoadTest.java)
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityLoadTest.java?p2=webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityLoadTest.java&p1=webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_030_BusinessEntityLoadTest.java&r1=823926&r2=824479&rev=824479&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_030_BusinessEntityLoadTest.java (original)
+++ webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityLoadTest.java Mon Oct 12 19:59:15 2009
@@ -12,7 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juddi.v3.client;
+package org.apache.juddi.v3.tck;
import org.apache.commons.configuration.ConfigurationException;
import org.junit.BeforeClass;
Propchange: webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityLoadTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Oct 12 19:59:15 2009
@@ -0,0 +1 @@
+/webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_030_BusinessEntityLoadTest.java:797614-802957
Copied: webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceIntegrationTest.java (from r823926, webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_040_BusinessServiceIntegrationTest.java)
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceIntegrationTest.java?p2=webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceIntegrationTest.java&p1=webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_040_BusinessServiceIntegrationTest.java&r1=823926&r2=824479&rev=824479&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_040_BusinessServiceIntegrationTest.java (original)
+++ webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceIntegrationTest.java Mon Oct 12 19:59:15 2009
@@ -12,7 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juddi.v3.client;
+package org.apache.juddi.v3.tck;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.juddi.Registry;
Copied: webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceLoadTest.java (from r823926, webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_040_BusinessServiceLoadTest.java)
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceLoadTest.java?p2=webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceLoadTest.java&p1=webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_040_BusinessServiceLoadTest.java&r1=823926&r2=824479&rev=824479&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_040_BusinessServiceLoadTest.java (original)
+++ webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceLoadTest.java Mon Oct 12 19:59:15 2009
@@ -12,7 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juddi.v3.client;
+package org.apache.juddi.v3.tck;
import org.junit.Test;
Propchange: webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceLoadTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Oct 12 19:59:15 2009
@@ -0,0 +1 @@
+/webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_040_BusinessServiceLoadTest.java:797614-802957
Copied: webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_050_BindingTemplateIntegrationTest.java (from r823926, webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_050_BindingTemplateIntegrationTest.java)
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_050_BindingTemplateIntegrationTest.java?p2=webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_050_BindingTemplateIntegrationTest.java&p1=webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_050_BindingTemplateIntegrationTest.java&r1=823926&r2=824479&rev=824479&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_050_BindingTemplateIntegrationTest.java (original)
+++ webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_050_BindingTemplateIntegrationTest.java Mon Oct 12 19:59:15 2009
@@ -12,7 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juddi.v3.client;
+package org.apache.juddi.v3.tck;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.juddi.Registry;
Copied: webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_060_PublisherAssertionIntegrationTest.java (from r823926, webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_060_PublisherAssertionIntegrationTest.java)
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_060_PublisherAssertionIntegrationTest.java?p2=webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_060_PublisherAssertionIntegrationTest.java&p1=webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_060_PublisherAssertionIntegrationTest.java&r1=823926&r2=824479&rev=824479&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_060_PublisherAssertionIntegrationTest.java (original)
+++ webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_060_PublisherAssertionIntegrationTest.java Mon Oct 12 19:59:15 2009
@@ -12,7 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juddi.v3.client;
+package org.apache.juddi.v3.tck;
/**
* @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
Copied: webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_070_FindEntityIntegrationTest.java (from r823926, webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_070_FindEntityIntegrationTest.java)
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_070_FindEntityIntegrationTest.java?p2=webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_070_FindEntityIntegrationTest.java&p1=webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_070_FindEntityIntegrationTest.java&r1=823926&r2=824479&rev=824479&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_070_FindEntityIntegrationTest.java (original)
+++ webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_070_FindEntityIntegrationTest.java Mon Oct 12 19:59:15 2009
@@ -12,7 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juddi.v3.client;
+package org.apache.juddi.v3.tck;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.juddi.Registry;
Copied: webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_080_SubscriptionIntegrationTest.java (from r823926, webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_080_SubscriptionIntegrationTest.java)
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_080_SubscriptionIntegrationTest.java?p2=webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_080_SubscriptionIntegrationTest.java&p1=webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_080_SubscriptionIntegrationTest.java&r1=823926&r2=824479&rev=824479&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_080_SubscriptionIntegrationTest.java (original)
+++ webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_080_SubscriptionIntegrationTest.java Mon Oct 12 19:59:15 2009
@@ -12,7 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juddi.v3.client;
+package org.apache.juddi.v3.tck;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.juddi.Registry;
Copied: webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java (from r823926, webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_090_SubscriptionListenerIntegrationTest.java)
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java?p2=webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java&p1=webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_090_SubscriptionListenerIntegrationTest.java&r1=823926&r2=824479&rev=824479&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_090_SubscriptionListenerIntegrationTest.java (original)
+++ webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java Mon Oct 12 19:59:15 2009
@@ -1,4 +1,4 @@
-package org.apache.juddi.v3.client;
+package org.apache.juddi.v3.tck;
/*
* Copyright 2001-2009 The Apache Software Foundation.
@@ -56,8 +56,6 @@
private static String authInfoJoe = null;
private static String authInfoSam = null;
- private static long START_BUFFER = 30000l;
-
@BeforeClass
public static void setup() throws ConfigurationException {
String clazz = UDDIClerkManager.getClientConfig().getNodes().get("default").getProxyTransport();
@@ -110,11 +108,19 @@
tckSubscriptionListener.saveService(authInfoJoe);
tckSubscriptionListener.saveNotifierSubscription(authInfoJoe);
- Thread.sleep(START_BUFFER);
- tckSubscriptionListener.changeSubscribedObject(authInfoJoe);
-
- String test = readLogAsString("./target/uddiclient.log");
-
+ tckSubscriptionListener.changeSubscribedObject(authInfoJoe);
+
+ //waiting up to 10 seconds for the listener to notice the change.
+ String test="";
+ for (int i=0; i<20; i++) {
+ Thread.sleep(500);
+ test = readLogAsString("./target/uddiclient.log");
+ System.out.print(".");
+ if (test.contains("<name xml:lang=\"en\">Notifier One</name>")) {
+ System.out.print("Found String");
+ break;
+ }
+ }
if (! test.contains("<name xml:lang=\"en\">Notifier One</name>")) {
Assert.fail("Notification does not contain the correct service");
}
Propchange: webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Oct 12 19:59:15 2009
@@ -0,0 +1 @@
+/webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_090_SubscriptionListenerIntegrationTest.java:797614-802957
Copied: webservices/juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/jaxb/EntityCreator.java (from r823926, webservices/juddi/trunk/uddi-tck/src/main/java/org/apache/juddi/v3/tck/EntityCreator.java)
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/jaxb/EntityCreator.java?p2=webservices/juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/jaxb/EntityCreator.java&p1=webservices/juddi/trunk/uddi-tck/src/main/java/org/apache/juddi/v3/tck/EntityCreator.java&r1=823926&r2=824479&rev=824479&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-tck/src/main/java/org/apache/juddi/v3/tck/EntityCreator.java (original)
+++ webservices/juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/jaxb/EntityCreator.java Mon Oct 12 19:59:15 2009
@@ -12,7 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juddi.v3.tck;
+package org.apache.juddi.jaxb;
/**
* @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
Propchange: webservices/juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/jaxb/EntityCreator.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Oct 12 19:59:15 2009
@@ -0,0 +1 @@
+/webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/EntityCreator.java:797614-802957
---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org