You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by lr...@apache.org on 2007/04/16 20:15:46 UTC
svn commit: r529348 - in /incubator/tuscany/sandbox/lresende/das: ./ api/
ldap/ ldap/src/main/resources/ ldap/src/test/java/org/
ldap/src/test/java/org/apache/ ldap/src/test/java/org/apache/tuscany/
ldap/src/test/java/org/apache/tuscany/das/ xquery/ xq...
Author: lresende
Date: Mon Apr 16 11:15:44 2007
New Revision: 529348
URL: http://svn.apache.org/viewvc?view=rev&rev=529348
Log:
Test cases for factory implementation using service locator
Added:
incubator/tuscany/sandbox/lresende/das/ldap/src/main/resources/ldap-config.xsd (with props)
incubator/tuscany/sandbox/lresende/das/ldap/src/test/java/org/
incubator/tuscany/sandbox/lresende/das/ldap/src/test/java/org/apache/
incubator/tuscany/sandbox/lresende/das/ldap/src/test/java/org/apache/tuscany/
incubator/tuscany/sandbox/lresende/das/ldap/src/test/java/org/apache/tuscany/das/
incubator/tuscany/sandbox/lresende/das/xquery/src/test/java/org/
incubator/tuscany/sandbox/lresende/das/xquery/src/test/java/org/apache/
incubator/tuscany/sandbox/lresende/das/xquery/src/test/java/org/apache/tuscany/
incubator/tuscany/sandbox/lresende/das/xquery/src/test/java/org/apache/tuscany/das/
incubator/tuscany/sandbox/lresende/das/xquery/src/test/java/org/apache/tuscany/das/xquery/
incubator/tuscany/sandbox/lresende/das/xquery/src/test/java/org/apache/tuscany/das/xquery/XQueryDASFactoryTestCase.java (with props)
Removed:
incubator/tuscany/sandbox/lresende/das/ldap/src/main/resources/config.xsd
Modified:
incubator/tuscany/sandbox/lresende/das/api/pom.xml
incubator/tuscany/sandbox/lresende/das/ldap/pom.xml
incubator/tuscany/sandbox/lresende/das/pom.xml
incubator/tuscany/sandbox/lresende/das/xquery/pom.xml
Modified: incubator/tuscany/sandbox/lresende/das/api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/lresende/das/api/pom.xml?view=diff&rev=529348&r1=529347&r2=529348
==============================================================================
--- incubator/tuscany/sandbox/lresende/das/api/pom.xml (original)
+++ incubator/tuscany/sandbox/lresende/das/api/pom.xml Mon Apr 16 11:15:44 2007
@@ -18,12 +18,13 @@
* under the License.
-->
<project>
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.tuscany.das</groupId>
<artifactId>tuscany-das</artifactId>
- <version>1.0-incubator-SNAPSHOT</version>
+ <version>1.0-incubating-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
+
<artifactId>tuscany-das-api</artifactId>
<name>Tuscany DAS API</name>
@@ -31,13 +32,14 @@
<dependency>
<groupId>org.apache.tuscany.sdo</groupId>
<artifactId>tuscany-sdo-impl</artifactId>
+ <version>${sdo.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
- <scope>test</scope>
+ <scope>test</scope>
</dependency>
</dependencies>
Modified: incubator/tuscany/sandbox/lresende/das/ldap/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/lresende/das/ldap/pom.xml?view=diff&rev=529348&r1=529347&r2=529348
==============================================================================
--- incubator/tuscany/sandbox/lresende/das/ldap/pom.xml (original)
+++ incubator/tuscany/sandbox/lresende/das/ldap/pom.xml Mon Apr 16 11:15:44 2007
@@ -18,12 +18,14 @@
* under the License.
-->
<project>
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.tuscany.das</groupId>
<artifactId>tuscany-das</artifactId>
- <version>1.0-incubator-SNAPSHOT</version>
+ <version>1.0-incubating-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.tuscany.das-ldap</groupId>
<artifactId>tuscany-das-ldap</artifactId>
<name>Tuscany DAS for LDAP</name>
@@ -31,12 +33,13 @@
<dependency>
<groupId>org.apache.tuscany.das</groupId>
<artifactId>tuscany-das-api</artifactId>
- <version>${version}</version>
+ <version>${das.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sdo</groupId>
<artifactId>tuscany-sdo-impl</artifactId>
+ <version>${sdo.version}</version>
</dependency>
<dependency>
@@ -70,7 +73,7 @@
<execution>
<id>config</id>
<configuration>
- <schemaFile>${basedir}/src/main/resources/config.xsd</schemaFile>
+ <schemaFile>${basedir}/src/main/resources/ldap-config.xsd</schemaFile>
<noNotification>true</noNotification>
<noUnsettable>true</noUnsettable>
</configuration>
Added: incubator/tuscany/sandbox/lresende/das/ldap/src/main/resources/ldap-config.xsd
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/lresende/das/ldap/src/main/resources/ldap-config.xsd?view=auto&rev=529348
==============================================================================
--- incubator/tuscany/sandbox/lresende/das/ldap/src/main/resources/ldap-config.xsd (added)
+++ incubator/tuscany/sandbox/lresende/das/ldap/src/main/resources/ldap-config.xsd Mon Apr 16 11:15:44 2007
@@ -0,0 +1,59 @@
+<?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.
+ -->
+<xsd:schema
+ xmlns:config="http://org.apache.tuscany.das/config.xsd"
+ xmlns:ldap-config="http://org.apache.tuscany.das.ldap/config.xsd"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="http://org.apache.tuscany.das.ldap/config.xsd"
+ elementFormDefault="qualified">
+
+ <import namespace="http://org.apache.tuscany.das/config.xsd" schemaLocation="config.xsd"/>
+ <xsd:include schemaLocation="http://org.apache.tuscany.das/config.xsd"/>
+
+ <xsd:element name="LdapConfig" type="ldap-config:Config"/>
+
+ <xsd:complexType name="LdapConfig">
+ <xsd:complexContent>
+ <xsd:extension base="http://org.apache.tuscany.das/config.xsd:Config">
+ <xsd:sequence>
+ <xsd:element maxOccurs="1" minOccurs="0" name="ConnectionInfo" type="config:ConnectionInfo"/>
+ </xsd:sequence>
+ <xsd:attribute name="uri" type="xsd:string"/>
+ <xsd:attribute name="dataObjectModel" type="xsd:string"/>
+ </xsd:extension>
+ </xsd:complexContent>
+ </xsd:complexType>
+
+ <xsd:complexType name="ConnectionProperties">
+ <xsd:attribute name="driverClass" type="xsd:string"/>
+ <xsd:attribute name="databaseURL" type="xsd:string"/>
+ <xsd:attribute name="userName" type="xsd:string" default=""/>
+ <xsd:attribute name="password" type="xsd:string" default=""/>
+ <xsd:attribute name="loginTimeout" type="xsd:int" default="0"/>
+ </xsd:complexType>
+
+ <xsd:complexType name="ConnectionInfo">
+ <xsd:sequence>
+ <xsd:element maxOccurs="1" minOccurs="0" name="ConnectionProperties" type="config:ConnectionProperties"/>
+ </xsd:sequence>
+ <xsd:attribute name="dataSource" type="xsd:string"/>
+ <xsd:attribute name="managedtx" type="xsd:boolean" default="true"/>
+ </xsd:complexType>
+</xsd:schema>
Propchange: incubator/tuscany/sandbox/lresende/das/ldap/src/main/resources/ldap-config.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/tuscany/sandbox/lresende/das/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/lresende/das/pom.xml?view=diff&rev=529348&r1=529347&r2=529348
==============================================================================
--- incubator/tuscany/sandbox/lresende/das/pom.xml (original)
+++ incubator/tuscany/sandbox/lresende/das/pom.xml Mon Apr 16 11:15:44 2007
@@ -22,14 +22,20 @@
<parent>
<groupId>org.apache.tuscany</groupId>
<artifactId>parent</artifactId>
- <version>2-incubator-SNAPSHOT</version>
+ <version>2-incubating-SNAPSHOT</version>
</parent>
+
<groupId>sandbox</groupId>
<artifactId>lresende</artifactId>
<packaging>pom</packaging>
<name>Tuscany Sanbox</name>
- <version>1.0-incubator-SNAPSHOT</version>
+ <version>1.0-incubating-SNAPSHOT</version>
+ <properties>
+ <das.version>1.0-incubating-SNAPSHOT</das.version>
+ <sdo.version>1.0-incubator-SNAPSHOT</sdo.version>
+ </properties>
+
<modules>
<module>api</module>
<module>ldap</module>
Modified: incubator/tuscany/sandbox/lresende/das/xquery/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/lresende/das/xquery/pom.xml?view=diff&rev=529348&r1=529347&r2=529348
==============================================================================
--- incubator/tuscany/sandbox/lresende/das/xquery/pom.xml (original)
+++ incubator/tuscany/sandbox/lresende/das/xquery/pom.xml Mon Apr 16 11:15:44 2007
@@ -18,12 +18,14 @@
* under the License.
-->
<project>
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.tuscany.das</groupId>
<artifactId>tuscany-das</artifactId>
- <version>1.0-incubator-SNAPSHOT</version>
+ <version>1.0-incubating-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.tuscany.das-xquery</groupId>
<artifactId>tuscany-das-xquery</artifactId>
<name>Tuscany DAS for XQUERY</name>
@@ -31,12 +33,13 @@
<dependency>
<groupId>org.apache.tuscany.das</groupId>
<artifactId>tuscany-das-api</artifactId>
- <version>1.0-incubator-SNAPSHOT</version>
+ <version>${das.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sdo</groupId>
<artifactId>tuscany-sdo-impl</artifactId>
+ <version>${sdo.version}</version>
</dependency>
<dependency>
Added: incubator/tuscany/sandbox/lresende/das/xquery/src/test/java/org/apache/tuscany/das/xquery/XQueryDASFactoryTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/lresende/das/xquery/src/test/java/org/apache/tuscany/das/xquery/XQueryDASFactoryTestCase.java?view=auto&rev=529348
==============================================================================
--- incubator/tuscany/sandbox/lresende/das/xquery/src/test/java/org/apache/tuscany/das/xquery/XQueryDASFactoryTestCase.java (added)
+++ incubator/tuscany/sandbox/lresende/das/xquery/src/test/java/org/apache/tuscany/das/xquery/XQueryDASFactoryTestCase.java Mon Apr 16 11:15:44 2007
@@ -0,0 +1,39 @@
+/*
+ * 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.das.xquery;
+
+import junit.framework.TestCase;
+
+import org.apache.tuscany.das.DASFactory;
+import org.apache.tuscany.das.xquery.impl.XqueryDASFactoryImpl;
+
+public class XQueryDASFactoryTestCase extends TestCase {
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ }
+
+ public void testDiscoverFactoryInstance() {
+ DASFactory factory = DASFactory.getInstance(XqueryDASFactoryImpl.NAMESPACE);
+
+ assertNotNull(factory);
+ assertEquals(factory.getNamespace(), XqueryDASFactoryImpl.NAMESPACE);
+ }
+}
Propchange: incubator/tuscany/sandbox/lresende/das/xquery/src/test/java/org/apache/tuscany/das/xquery/XQueryDASFactoryTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org