Author: kstam
Date: Thu Jul 5 14:50:17 2007
New Revision: 553650
URL: http://svn.apache.org/viewvc?view=rev&rev=553650
Log:
SCOUT-27, adding embedded db support. By default it is using Derby, as
configured in the juddi.properties.
The maven2 build (including tests) should now work out of the box.
Note that this won't work until people.apache.org comes back up and I can push
a new juddi-SNAPSHOT.
Added:
webservices/scout/trunk/scout/src/test/resources/scout.properties (with
props)
Modified:
webservices/scout/trunk/pom.xml
webservices/scout/trunk/scout/ (props changed)
webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/BaseTestCase.java
webservices/scout/trunk/scout/src/test/resources/juddi.properties
Modified: webservices/scout/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/scout/trunk/pom.xml?view=diff&rev=553650&r1=553649&r2=553650
==============================================================================
--- webservices/scout/trunk/pom.xml (original)
+++ webservices/scout/trunk/pom.xml Thu Jul 5 14:50:17 2007
@@ -1,413 +1,365 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.ws.scout</groupId>
- <artifactId>scout-parent</artifactId>
- <packaging>pom</packaging>
- <name>Scout</name>
- <version>SNAPSHOT</version>
- <description>
- Apache Scout is an implementation of the JSR 93 - JavaTM API for
- XML Registries 1.0 (JAXR)
- </description>
- <url>http://ws.apache.org/scout/</url>
- <issueManagement>
- <system>JIRA</system>
- <url>http://issues.apache.org/jira/browse/SCOUT</url>
- </issueManagement>
- <ciManagement>
- <system>Continuum</system>
- <url>unknown</url>
- <notifiers>
- <notifier>
- <sendOnError>false</sendOnError>
- <sendOnFailure>false</sendOnFailure>
- <sendOnSuccess>false</sendOnSuccess>
- <sendOnWarning>false</sendOnWarning>
- <configuration>
-
<address>[email protected]</address>
- </configuration>
- </notifier>
- </notifiers>
- </ciManagement>
- <inceptionYear>2004</inceptionYear>
- <mailingLists>
- <mailingList>
- <name>WS Scout Developers</name>
- <subscribe>[EMAIL PROTECTED]</subscribe>
- <unsubscribe>
- [EMAIL PROTECTED]
- </unsubscribe>
- <post>[email protected]</post>
- <archive>
-
http://mail-archives.apache.org/mod_mbox/ws-scout-dev/
- </archive>
- </mailingList>
- </mailingLists>
- <developers>
- <developer>
- <name>Steve Viens</name>
- <id>sviens</id>
- <email>[EMAIL PROTECTED]</email>
- <organization></organization>
- </developer>
- <developer>
- <name>Anil Saldhana</name>
- <id>anil</id>
- <email>[EMAIL PROTECTED]</email>
- <organization></organization>
- </developer>
- <developer>
- <name>Davanum Srinivas</name>
- <id>dims</id>
- <email>[EMAIL PROTECTED]</email>
- <organization></organization>
- </developer>
- <developer>
- <name>Kurt T Stam</name>
- <id>kstam</id>
- <email>[EMAIL PROTECTED]</email>
- <organization></organization>
- </developer>
- </developers>
- <contributors>
- <contributor>
- <name>Lin Sun</name>
- <email></email>
- <organization></organization>
- </contributor>
- </contributors>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
-
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
- <scm>
- <connection>
-
scm:svn:http://svn.apache.org/repos/asf/webservices/scout/trunk/
- </connection>
- <developerConnection>
-
scm:svn:https://svn.apache.org/repos/asf/webservices/scout/trunk/
- </developerConnection>
- <url>
-
http://svn.apache.org/viewcvs.cgi/webservices/scout/trunk/
- </url>
- </scm>
- <organization>
- <name>Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <inherited>true</inherited>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>
-
src/main/assembly/bin.xml
- </descriptor>
- <descriptor>
-
src/main/assembly/src.xml
- </descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <attach>true</attach>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <profiles>
- <profile>
- <id>release</id>
- <activation>
- <property>
- <name>release</name>
- <value></value>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
-
<artifactId>maven-javadoc-plugin</artifactId>
- <executions>
- <execution>
- <goals>
-
<goal>jar</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <attach>true</attach>
- </configuration>
- </plugin>
- <plugin>
-
<artifactId>maven-one-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>
-
install-maven-one-repository
- </goal>
- <goal>
-
deploy-maven-one-repository
- </goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <remoteRepositoryId>
- apache-snapshots
- </remoteRepositoryId>
- <remoteRepositoryUrl>
-
scp://people.apache.org/www/people.apache.org/repo/m1-ibiblio-rsync-repository
- </remoteRepositoryUrl>
- </configuration>
- </plugin>
- <plugin>
-
<artifactId>maven-release-plugin</artifactId>
- <configuration>
- <tagBase>
-
http://svn.apache.org/repos/asf/webservices/scout/tags/
- </tagBase>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>rc</id>
- <activation>
- <property>
- <name>rc</name>
- <value></value>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
-
<artifactId>maven-javadoc-plugin</artifactId>
- <executions>
- <execution>
- <goals>
-
<goal>jar</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <attach>true</attach>
- </configuration>
- </plugin>
- <plugin>
-
<artifactId>maven-one-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>
-
install-maven-one-repository
- </goal>
- <goal>
-
deploy-maven-one-repository
- </goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <remoteRepositoryId>
- apache-snapshots
- </remoteRepositoryId>
- <remoteRepositoryUrl>
-
scp://people.apache.org/www/people.apache.org/repo/m1-snapshot-repository
- </remoteRepositoryUrl>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
- <modules>
- <module>jaxr-api</module>
- <module>scout</module>
- </modules>
- <repositories>
- <repository>
- <id>maven2</id>
- <name>Maven Central Development Repository</name>
- <url>http://repo1.maven.org/maven2</url>
- </repository>
- <repository>
- <id>snapshot-apache</id>
- <name>Apache Snapshot repository</name>
- <url>
-
http://people.apache.org/repo/m2-snapshot-repository
- </url>
- </repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots />
- <id>snapshot</id>
- <name>Snapshot repository</name>
- <url>http://snapshots.maven.codehaus.org/maven2/</url>
- </pluginRepository>
- <pluginRepository>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots />
- <id>snapshot-apache</id>
- <name>Apache Snapshot repository</name>
- <url>
-
http://people.apache.org/repo/m2-snapshot-repository
- </url>
- </pluginRepository>
- </pluginRepositories>
- <dependencies>
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-activation</artifactId>
- <version>1.0.2-rc4</version>
- </dependency>
- <dependency>
- <groupId>jdom</groupId>
- <artifactId>jdom</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
- </dependency>
- <dependency>
- <groupId>commons-discovery</groupId>
- <artifactId>commons-discovery</artifactId>
- <version>0.2</version>
- </dependency>
- <dependency>
- <groupId>axis</groupId>
- <artifactId>axis</artifactId>
- <version>1.4</version>
- </dependency>
- <dependency>
- <groupId>axis</groupId>
- <artifactId>axis-saaj</artifactId>
- <version>1.4</version>
- </dependency>
- <dependency>
- <groupId>axis</groupId>
- <artifactId>axis-jaxrpc</artifactId>
- <version>1.4</version>
- </dependency>
- <dependency>
- <groupId>xmlbeans</groupId>
- <artifactId>xbean</artifactId>
- <version>2.2.0</version>
- </dependency>
- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- <version>1.0.1</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- </dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.8.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.juddi</groupId>
- <artifactId>juddi</artifactId>
- <version>SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>3.1.12</version>
- </dependency>
- </dependencies>
- <reporting>
- <plugins>
- <plugin>
- <artifactId>
- maven-project-info-reports-plugin
- </artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jdepend-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
- <inherited>false</inherited>
- </plugin>
- </plugins>
- </reporting>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>xmlbeans</groupId>
- <artifactId>xbean</artifactId>
- <version>2.2.0</version>
- </dependency>
- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- <version>1.0.1</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
- <distributionManagement>
- <repository>
- <id>apache-repo</id>
- <name>Maven Central Repository</name>
- <url>
-
scpexe://people.apache.org//www/people.apache.org/repo/m2-ibiblio-rsync-repository
- </url>
- </repository>
- <snapshotRepository>
- <id>apache-snapshots</id>
- <name>Apache Development Repository</name>
- <url>
-
scpexe://people.apache.org//www/people.apache.org/repo/m2-snapshot-repository
- </url>
- </snapshotRepository>
- <site>
- <id>website</id>
- <url>
-
scpexe://people.apache.org/www/ws.apache.org/scout
- </url>
- </site>
- </distributionManagement>
- <properties>
- <scout.version>${pom.version}</scout.version>
- </properties>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?><project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.ws.scout</groupId>
+ <artifactId>scout-parent</artifactId>
+ <packaging>pom</packaging>
+ <name>Scout</name>
+ <version>SNAPSHOT</version>
+ <description>Apache Scout is an implementation of the JSR 93 - JavaTM API for
+ XML Registries 1.0 (JAXR)</description>
+ <url>http://ws.apache.org/scout/</url>
+ <issueManagement>
+ <system>JIRA</system>
+ <url>http://issues.apache.org/jira/browse/SCOUT</url>
+ </issueManagement>
+ <ciManagement>
+ <system>Continuum</system>
+ <url>unknown</url>
+ <notifiers>
+ <notifier>
+ <sendOnError>false</sendOnError>
+ <sendOnFailure>false</sendOnFailure>
+ <sendOnSuccess>false</sendOnSuccess>
+ <sendOnWarning>false</sendOnWarning>
+ <configuration>
+ <address>[email protected]</address>
+ </configuration>
+ </notifier>
+ </notifiers>
+ </ciManagement>
+ <inceptionYear>2004</inceptionYear>
+ <mailingLists>
+ <mailingList>
+ <name>WS Scout Developers</name>
+ <subscribe>[EMAIL PROTECTED]</subscribe>
+ <unsubscribe>[EMAIL PROTECTED]</unsubscribe>
+ <post>[email protected]</post>
+ <archive>http://mail-archives.apache.org/mod_mbox/ws-scout-dev/</archive>
+ </mailingList>
+ </mailingLists>
+ <developers>
+ <developer>
+ <id>sviens</id>
+ <name>Steve Viens</name>
+ <email>[EMAIL PROTECTED]</email>
+ <organization></organization>
+ </developer>
+ <developer>
+ <id>anil</id>
+ <name>Anil Saldhana</name>
+ <email>[EMAIL PROTECTED]</email>
+ <organization></organization>
+ </developer>
+ <developer>
+ <id>dims</id>
+ <name>Davanum Srinivas</name>
+ <email>[EMAIL PROTECTED]</email>
+ <organization></organization>
+ </developer>
+ <developer>
+ <id>kstam</id>
+ <name>Kurt T Stam</name>
+ <email>[EMAIL PROTECTED]</email>
+ <organization></organization>
+ </developer>
+ </developers>
+ <contributors>
+ <contributor>
+ <name>Lin Sun</name>
+ <email></email>
+ <organization></organization>
+ </contributor>
+ </contributors>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <scm>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/webservices/scout/trunk/</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/webservices/scout/trunk/</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/webservices/scout/trunk/</url>
+ </scm>
+ <organization>
+ <name>Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <inherited>true</inherited>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/bin.xml</descriptor>
+ <descriptor>src/main/assembly/src.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <attach>true</attach>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <profiles>
+ <profile>
+ <id>release</id>
+ <activation>
+ <property>
+ <name>release</name>
+ <value></value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <attach>true</attach>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-one-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>install-maven-one-repository</goal>
+ <goal>deploy-maven-one-repository</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <remoteRepositoryId>apache-snapshots</remoteRepositoryId>
+
<remoteRepositoryUrl>scp://people.apache.org/www/people.apache.org/repo/m1-ibiblio-rsync-repository</remoteRepositoryUrl>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+
<tagBase>http://svn.apache.org/repos/asf/webservices/scout/tags/</tagBase>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>rc</id>
+ <activation>
+ <property>
+ <name>rc</name>
+ <value></value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <attach>true</attach>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-one-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>install-maven-one-repository</goal>
+ <goal>deploy-maven-one-repository</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <remoteRepositoryId>apache-snapshots</remoteRepositoryId>
+
<remoteRepositoryUrl>scp://people.apache.org/www/people.apache.org/repo/m1-snapshot-repository</remoteRepositoryUrl>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+ <modules>
+ <module>jaxr-api</module>
+ <module>scout</module>
+ </modules>
+ <repositories>
+ <repository>
+ <id>maven2</id>
+ <name>Maven Central Development Repository</name>
+ <url>http://repo1.maven.org/maven2</url>
+ </repository>
+ <repository>
+ <id>snapshot-apache</id>
+ <name>Apache Snapshot repository</name>
+ <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots />
+ <id>snapshot</id>
+ <name>Snapshot repository</name>
+ <url>http://snapshots.maven.codehaus.org/maven2/</url>
+ </pluginRepository>
+ <pluginRepository>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots />
+ <id>snapshot-apache</id>
+ <name>Apache Snapshot repository</name>
+ <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+ </pluginRepository>
+ </pluginRepositories>
+ <dependencies>
+ <dependency>
+ <groupId>geronimo-spec</groupId>
+ <artifactId>geronimo-spec-activation</artifactId>
+ <version>1.0.2-rc4</version>
+ </dependency>
+ <dependency>
+ <groupId>jdom</groupId>
+ <artifactId>jdom</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.0.4</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-discovery</groupId>
+ <artifactId>commons-discovery</artifactId>
+ <version>0.2</version>
+ </dependency>
+ <dependency>
+ <groupId>axis</groupId>
+ <artifactId>axis</artifactId>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>axis</groupId>
+ <artifactId>axis-saaj</artifactId>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>axis</groupId>
+ <artifactId>axis-jaxrpc</artifactId>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>xmlbeans</groupId>
+ <artifactId>xbean</artifactId>
+ <version>2.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>1.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.8.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.juddi</groupId>
+ <artifactId>juddi</artifactId>
+ <version>SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>10.1.2.1</version>
+ </dependency>
+ </dependencies>
+ <reporting>
+ <plugins>
+ <plugin>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jdepend-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <inherited>false</inherited>
+ </plugin>
+ </plugins>
+ </reporting>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>xmlbeans</groupId>
+ <artifactId>xbean</artifactId>
+ <version>2.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>1.0.1</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ <distributionManagement>
+ <repository>
+ <id>apache-repo</id>
+ <name>Maven Central Repository</name>
+
<url>scpexe://people.apache.org//www/people.apache.org/repo/m2-ibiblio-rsync-repository</url>
+ </repository>
+ <snapshotRepository>
+ <id>apache-snapshots</id>
+ <name>Apache Development Repository</name>
+
<url>scpexe://people.apache.org//www/people.apache.org/repo/m2-snapshot-repository</url>
+ </snapshotRepository>
+ <site>
+ <id>website</id>
+ <url>scpexe://people.apache.org/www/ws.apache.org/scout</url>
+ </site>
+ </distributionManagement>
+ <properties>
+ <scout.version>${pom.version}</scout.version>
+ </properties>
+</project>
\ No newline at end of file
Propchange: webservices/scout/trunk/scout/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Jul 5 14:50:17 2007
@@ -1,6 +1,7 @@
-*.iws
-.project
-.classpath
-maven.log
-junit*.properties
-target
+*.iws
+.project
+.classpath
+maven.log
+junit*.properties
+target
+juddi-derby-test-db
Modified:
webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/BaseTestCase.java
URL:
http://svn.apache.org/viewvc/webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/BaseTestCase.java?view=diff&rev=553650&r1=553649&r2=553650
==============================================================================
---
webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/BaseTestCase.java
(original)
+++
webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/BaseTestCase.java
Thu Jul 5 14:50:17 2007
@@ -20,7 +20,6 @@
import javax.xml.registry.Connection;
import javax.xml.registry.ConnectionFactory;
-import javax.xml.registry.JAXRException;
import junit.framework.TestCase;
@@ -36,7 +35,7 @@
protected Connection connection = null;
protected String userid = System.getProperty("uddi.test.uid") == null ?
- "jbossesb" :
+ "jdoe" :
System.getProperty("uddi.test.uid");
protected String passwd = System.getProperty("uddi.test.pass") == null ?
@@ -45,49 +44,53 @@
public void setUp()
{
- //LOCAL Transport
- final String INQUERY_URI =
"org.apache.juddi.registry.local.InquiryService#inquire";
- final String PUBLISH_URI =
"org.apache.juddi.registry.local.PublishService#publish";
- final String TRANSPORT_CLASS =
"org.apache.ws.scout.transport.LocalTransport";
-
- //RMI Transport
- //final String INQUERY_URI =
"jnp://localhost:1099/InquiryService?org.apache.juddi.registry.rmi.Inquiry#inquire";
- //final String PUBLISH_URI =
"jnp://localhost:1099/PublishService?org.apache.juddi.registry.rmi.Publish#publish";
- //final String TRANSPORT_CLASS =
"org.apache.ws.scout.transport.RMITransport";
-
- //SOAP Transport
- //final String INQUERY_URI =
"http://localhost:8080/juddi/inquiry";;
- //final String PUBLISH_URI =
"http://localhost:8080/juddi/publish";;
- //final String TRANSPORT_CLASS =
"org.apache.ws.scout.transport.AxisTransport";
-
- // Define connection configuration properties
- // To query, you need only the query URL
- Properties props = new Properties();
-
- props.setProperty("javax.xml.registry.queryManagerURL",
-
System.getProperty("javax.xml.registry.queryManagerURL") == null ?
- INQUERY_URI :
-
System.getProperty("javax.xml.registry.queryManagerURL"));
-
- props.setProperty("javax.xml.registry.lifeCycleManagerURL",
-
System.getProperty("javax.xml.registry.lifeCycleManagerURL") == null ?
- PUBLISH_URI :
-
System.getProperty("javax.xml.registry.lifeCycleManagerURL"));
-
- props.setProperty("javax.xml.registry.factoryClass",
- "org.apache.ws.scout.registry.ConnectionFactoryImpl");
-
-
- props.setProperty("scout.proxy.transportClass", TRANSPORT_CLASS);
- //System.setProperty("scout.proxy.transportClass", TRANSPORT_CLASS);
-
+
System.out.println("************************************************************");
try
{
+ Properties scoutProperties = new Properties();
+
scoutProperties.load(getClass().getResourceAsStream("/scout.properties"));
+
+ Properties juddiProperties = new Properties();
+
juddiProperties.load(getClass().getResourceAsStream("/juddi.properties"));
+
+ final String INQUERY_URI =
scoutProperties.getProperty("inquery.uri");
+ final String PUBLISH_URI =
scoutProperties.getProperty("publish.uri");
+ final String TRANSPORT_CLASS =
scoutProperties.getProperty("transport.class");
+
+ if (scoutProperties.getProperty("userid")!=null) {
+ userid = scoutProperties.getProperty("userid");
+ }
+ if (scoutProperties.getProperty("password")!=null) {
+ passwd = scoutProperties.getProperty("password");
+ }
+
+ // Define connection configuration properties
+ // To query, you need only the query URL
+ Properties props = new Properties();
+
+ props.setProperty("javax.xml.registry.queryManagerURL",
+
System.getProperty("javax.xml.registry.queryManagerURL") == null ?
+ INQUERY_URI :
+
System.getProperty("javax.xml.registry.queryManagerURL"));
+
+ props.setProperty("javax.xml.registry.lifeCycleManagerURL",
+
System.getProperty("javax.xml.registry.lifeCycleManagerURL") == null ?
+ PUBLISH_URI :
+
System.getProperty("javax.xml.registry.lifeCycleManagerURL"));
+
+ props.setProperty("javax.xml.registry.factoryClass",
+ "org.apache.ws.scout.registry.ConnectionFactoryImpl");
+
+
+ props.setProperty("scout.proxy.transportClass", TRANSPORT_CLASS);
+ //System.setProperty("scout.proxy.transportClass",
TRANSPORT_CLASS);
+
+
// Create the connection, passing it the configuration properties
ConnectionFactory factory = ConnectionFactory.newInstance();
factory.setProperties(props);
connection = factory.createConnection();
- } catch (JAXRException e)
+ } catch (Exception e)
{
e.printStackTrace();
}
@@ -99,7 +102,8 @@
{
if (connection != null)
connection.close();
- } catch (JAXRException e)
+
+ } catch (Exception e)
{
}
Modified: webservices/scout/trunk/scout/src/test/resources/juddi.properties
URL:
http://svn.apache.org/viewvc/webservices/scout/trunk/scout/src/test/resources/juddi.properties?view=diff&rev=553650&r1=553649&r2=553650
==============================================================================
--- webservices/scout/trunk/scout/src/test/resources/juddi.properties (original)
+++ webservices/scout/trunk/scout/src/test/resources/juddi.properties Thu Jul
5 14:50:17 2007
@@ -34,16 +34,25 @@
# jUDDI DataStore module currently to use
juddi.dataStore = org.apache.juddi.datastore.jdbc.JDBCDataStore
-
# use a dataSource (if set to false a direct
# jdbc connection will be used.
juddi.isUseDataSource=false
-juddi.jdbcDriver=com.mysql.jdbc.Driver
-juddi.jdbcUrl=jdbc:mysql://localhost/juddi
-juddi.jdbcUsername=juddi
-juddi.jdbcPassword=juddi
+juddi.jdbcDriver=org.apache.derby.jdbc.EmbeddedDriver
+juddi.jdbcUrl=jdbc:derby:juddi-derby-test-db;create=true
+juddi.jdbcUsername=
+juddi.jdbcPassword=
+
+#juddi.jdbcDriver=com.mysql.jdbc.Driver
+#juddi.jdbcUrl=jdbc:mysql://localhost/juddi
+#juddi.jdbcUsername=juddi
+#juddi.jdbcPassword=juddi
+
# jUDDI DataSource to use
juddi.dataSource=java:comp/env/jdbc/juddiDB
+# jUDDI database creation
+juddi.createDatabase=true
+juddi.databaseExistsSql=select * from BUSINESS_ENTITY
+juddi.sqlFiles=sql/derby/create_database.sql,sql/insert_publishers.sql
# jUDDI UUIDGen implementation to use
juddi.uuidgen = org.apache.juddi.uuidgen.DefaultUUIDGen
Added: webservices/scout/trunk/scout/src/test/resources/scout.properties
URL:
http://svn.apache.org/viewvc/webservices/scout/trunk/scout/src/test/resources/scout.properties?view=auto&rev=553650
==============================================================================
--- webservices/scout/trunk/scout/src/test/resources/scout.properties (added)
+++ webservices/scout/trunk/scout/src/test/resources/scout.properties Thu Jul
5 14:50:17 2007
@@ -0,0 +1,21 @@
+########################################################################################################
+# TRANSPORT
+########################################################################################################
+#local transport
+inquery.uri =org.apache.juddi.registry.local.InquiryService#inquire
+publish.uri =org.apache.juddi.registry.local.PublishService#publish
+transport.class =org.apache.ws.scout.transport.LocalTransport
+#rmi transport
+#inquery.uri
=jnp://localhost:1099/InquiryService?org.apache.juddi.registry.rmi.Inquiry#inquire
+#publish.uri
=jnp://localhost:1099/PublishService?org.apache.juddi.registry.rmi.Publish#publish
+#transport.class =org.apache.ws.scout.transport.RMITransport
+#soap transport
+#inquery.uri =http://localhost:8080/juddi/inquiry
+#publish.uri =http://localhost:8080/juddi/publish
+#transport.class =org.apache.ws.scout.transport.AxisTransport
+#
+########################################################################################################
+# SECURITY
+########################################################################################################
+userid =jdoe
+password =password
\ No newline at end of file
Propchange: webservices/scout/trunk/scout/src/test/resources/scout.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: webservices/scout/trunk/scout/src/test/resources/scout.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
