Return-Path: Delivered-To: apmail-ws-scout-dev-archive@www.apache.org Received: (qmail 91915 invoked from network); 5 Jul 2007 21:50:41 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 5 Jul 2007 21:50:41 -0000 Received: (qmail 45584 invoked by uid 500); 5 Jul 2007 21:50:43 -0000 Delivered-To: apmail-ws-scout-dev-archive@ws.apache.org Received: (qmail 45538 invoked by uid 500); 5 Jul 2007 21:50:43 -0000 Mailing-List: contact scout-dev-help@ws.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: scout-dev@ws.apache.org List-Id: Delivered-To: mailing list scout-dev@ws.apache.org Received: (qmail 45527 invoked by uid 500); 5 Jul 2007 21:50:43 -0000 Delivered-To: apmail-ws-scout-cvs@ws.apache.org Received: (qmail 45524 invoked by uid 99); 5 Jul 2007 21:50:43 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Jul 2007 14:50:43 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Jul 2007 14:50:39 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id E0F841A981A; Thu, 5 Jul 2007 14:50:18 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r553650 - in /webservices/scout/trunk: pom.xml scout/ scout/src/test/java/org/apache/ws/scout/BaseTestCase.java scout/src/test/resources/juddi.properties scout/src/test/resources/scout.properties Date: Thu, 05 Jul 2007 21:50:18 -0000 To: scout-cvs@ws.apache.org From: kstam@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070705215018.E0F841A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 @@ - - - 4.0.0 - org.apache.ws.scout - scout-parent - pom - Scout - SNAPSHOT - - Apache Scout is an implementation of the JSR 93 - JavaTM API for - XML Registries 1.0 (JAXR) - - http://ws.apache.org/scout/ - - JIRA - http://issues.apache.org/jira/browse/SCOUT - - - Continuum - unknown - - - false - false - false - false - -
scout-dev@ws.apache.org
-
-
-
-
- 2004 - - - WS Scout Developers - scout-dev-subscribe@ws.apache.org - - scout-dev-unsubscribe@ws.apache.org - - scout-dev@ws.apache.org - - http://mail-archives.apache.org/mod_mbox/ws-scout-dev/ - - - - - - Steve Viens - sviens - sviens@apache.org - - - - Anil Saldhana - anil - anil@apache.org - - - - Davanum Srinivas - dims - dims@yahoo.com - - - - Kurt T Stam - kstam - kstam@apache.org - - - - - - Lin Sun - - - - - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - scm:svn:http://svn.apache.org/repos/asf/webservices/scout/trunk/ - - - scm:svn:https://svn.apache.org/repos/asf/webservices/scout/trunk/ - - - http://svn.apache.org/viewcvs.cgi/webservices/scout/trunk/ - - - - Apache Software Foundation - http://www.apache.org/ - - - - - maven-compiler-plugin - true - - 1.5 - 1.5 - - - - maven-assembly-plugin - - - - src/main/assembly/bin.xml - - - src/main/assembly/src.xml - - - gnu - - - - maven-source-plugin - - - - jar - - - - - true - - - - - - - release - - - release - - - - - - - maven-javadoc-plugin - - - - jar - - - - - true - - - - maven-one-plugin - - - - - install-maven-one-repository - - - deploy-maven-one-repository - - - - - - - apache-snapshots - - - scp://people.apache.org/www/people.apache.org/repo/m1-ibiblio-rsync-repository - - - - - maven-release-plugin - - - http://svn.apache.org/repos/asf/webservices/scout/tags/ - - - - - - - - rc - - - rc - - - - - - - maven-javadoc-plugin - - - - jar - - - - - true - - - - maven-one-plugin - - - - - install-maven-one-repository - - - deploy-maven-one-repository - - - - - - - apache-snapshots - - - scp://people.apache.org/www/people.apache.org/repo/m1-snapshot-repository - - - - - - - - - jaxr-api - scout - - - - maven2 - Maven Central Development Repository - http://repo1.maven.org/maven2 - - - snapshot-apache - Apache Snapshot repository - - http://people.apache.org/repo/m2-snapshot-repository - - - - - - - false - - - snapshot - Snapshot repository - http://snapshots.maven.codehaus.org/maven2/ - - - - false - - - snapshot-apache - Apache Snapshot repository - - http://people.apache.org/repo/m2-snapshot-repository - - - - - - geronimo-spec - geronimo-spec-activation - 1.0.2-rc4 - - - jdom - jdom - 1.0 - - - commons-logging - commons-logging - 1.0.4 - - - commons-discovery - commons-discovery - 0.2 - - - axis - axis - 1.4 - - - axis - axis-saaj - 1.4 - - - axis - axis-jaxrpc - 1.4 - - - xmlbeans - xbean - 2.2.0 - - - stax - stax-api - 1.0.1 - - - junit - junit - 3.8.1 - - - xerces - xercesImpl - 2.8.0 - - - org.apache.juddi - juddi - SNAPSHOT - - - mysql - mysql-connector-java - 3.1.12 - - - - - - - maven-project-info-reports-plugin - - - - org.codehaus.mojo - jdepend-maven-plugin - - - maven-site-plugin - false - - - - - - - xmlbeans - xbean - 2.2.0 - - - stax - stax-api - 1.0.1 - - - - - - apache-repo - Maven Central Repository - - scpexe://people.apache.org//www/people.apache.org/repo/m2-ibiblio-rsync-repository - - - - apache-snapshots - Apache Development Repository - - scpexe://people.apache.org//www/people.apache.org/repo/m2-snapshot-repository - - - - website - - scpexe://people.apache.org/www/ws.apache.org/scout - - - - - ${pom.version} - - -
+ + 4.0.0 + org.apache.ws.scout + scout-parent + pom + Scout + SNAPSHOT + Apache Scout is an implementation of the JSR 93 - JavaTM API for + XML Registries 1.0 (JAXR) + http://ws.apache.org/scout/ + + JIRA + http://issues.apache.org/jira/browse/SCOUT + + + Continuum + unknown + + + false + false + false + false + +
scout-dev@ws.apache.org
+
+
+
+
+ 2004 + + + WS Scout Developers + scout-dev-subscribe@ws.apache.org + scout-dev-unsubscribe@ws.apache.org + scout-dev@ws.apache.org + http://mail-archives.apache.org/mod_mbox/ws-scout-dev/ + + + + + sviens + Steve Viens + sviens@apache.org + + + + anil + Anil Saldhana + anil@apache.org + + + + dims + Davanum Srinivas + dims@yahoo.com + + + + kstam + Kurt T Stam + kstam@apache.org + + + + + + Lin Sun + + + + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + scm:svn:http://svn.apache.org/repos/asf/webservices/scout/trunk/ + scm:svn:https://svn.apache.org/repos/asf/webservices/scout/trunk/ + http://svn.apache.org/viewcvs.cgi/webservices/scout/trunk/ + + + Apache Software Foundation + http://www.apache.org/ + + + + + maven-compiler-plugin + true + + 1.5 + 1.5 + + + + maven-assembly-plugin + + + src/main/assembly/bin.xml + src/main/assembly/src.xml + + gnu + + + + maven-source-plugin + + + + jar + + + + + true + + + + + + + release + + + release + + + + + + + maven-javadoc-plugin + + + + jar + + + + + true + + + + maven-one-plugin + + + + install-maven-one-repository + deploy-maven-one-repository + + + + + apache-snapshots + scp://people.apache.org/www/people.apache.org/repo/m1-ibiblio-rsync-repository + + + + maven-release-plugin + + http://svn.apache.org/repos/asf/webservices/scout/tags/ + + + + + + + rc + + + rc + + + + + + + maven-javadoc-plugin + + + + jar + + + + + true + + + + maven-one-plugin + + + + install-maven-one-repository + deploy-maven-one-repository + + + + + apache-snapshots + scp://people.apache.org/www/people.apache.org/repo/m1-snapshot-repository + + + + + + + + jaxr-api + scout + + + + maven2 + Maven Central Development Repository + http://repo1.maven.org/maven2 + + + snapshot-apache + Apache Snapshot repository + http://people.apache.org/repo/m2-snapshot-repository + + + + + + false + + + snapshot + Snapshot repository + http://snapshots.maven.codehaus.org/maven2/ + + + + false + + + snapshot-apache + Apache Snapshot repository + http://people.apache.org/repo/m2-snapshot-repository + + + + + geronimo-spec + geronimo-spec-activation + 1.0.2-rc4 + + + jdom + jdom + 1.0 + + + commons-logging + commons-logging + 1.0.4 + + + commons-discovery + commons-discovery + 0.2 + + + axis + axis + 1.4 + + + axis + axis-saaj + 1.4 + + + axis + axis-jaxrpc + 1.4 + + + xmlbeans + xbean + 2.2.0 + + + stax + stax-api + 1.0.1 + + + junit + junit + 3.8.1 + + + xerces + xercesImpl + 2.8.0 + + + org.apache.juddi + juddi + SNAPSHOT + + + org.apache.derby + derby + 10.1.2.1 + + + + + + maven-project-info-reports-plugin + + + org.codehaus.mojo + jdepend-maven-plugin + + + maven-site-plugin + false + + + + + + + xmlbeans + xbean + 2.2.0 + + + stax + stax-api + 1.0.1 + + + + + + apache-repo + Maven Central Repository + scpexe://people.apache.org//www/people.apache.org/repo/m2-ibiblio-rsync-repository + + + apache-snapshots + Apache Development Repository + scpexe://people.apache.org//www/people.apache.org/repo/m2-snapshot-repository + + + website + scpexe://people.apache.org/www/ws.apache.org/scout + + + + ${pom.version} + +
\ 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: scout-dev-unsubscribe@ws.apache.org For additional commands, e-mail: scout-dev-help@ws.apache.org