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/03/25 18:33:30 UTC
svn commit: r522299 - in /incubator/tuscany/sandbox/lresende/das:
api/pom.xml ldap/pom.xml ldap/src/main/resources/config.xsd
Author: lresende
Date: Sun Mar 25 09:33:29 2007
New Revision: 522299
URL: http://svn.apache.org/viewvc?view=rev&rev=522299
Log:
Playing with extending the SDO Config model on DAS LDAP
Added:
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
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=522299&r1=522298&r2=522299
==============================================================================
--- incubator/tuscany/sandbox/lresende/das/api/pom.xml (original)
+++ incubator/tuscany/sandbox/lresende/das/api/pom.xml Sun Mar 25 09:33:29 2007
@@ -55,33 +55,34 @@
<build>
<plugins>
- <plugin>
- <groupId>org.apache.tuscany.sdo</groupId>
- <artifactId>tuscany-sdo-plugin</artifactId>
- <executions>
- <execution>
- <id>config</id>
+ <!-- Generate SDO DataObjects from XSD -->
+ <plugin>
+ <groupId>org.apache.tuscany.sdo</groupId>
+ <artifactId>tuscany-sdo-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>config</id>
+ <configuration>
+ <schemaFile>${basedir}/src/main/resources/config.xsd</schemaFile>
+ <noNotification>true</noNotification>
+ <noUnsettable>true</noUnsettable>
+ </configuration>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <schemaFile>${basedir}/src/main/resources/config.xsd</schemaFile>
- <noNotification>true</noNotification>
- <noUnsettable>true</noUnsettable>
+ <includes>
+ <include>**/*AllTestsDerby.java</include>
+ </includes>
</configuration>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>**/*AllTestsDerby.java</include>
- </includes>
- </configuration>
- </plugin>
+ </plugin>
</plugins>
</build>
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=522299&r1=522298&r2=522299
==============================================================================
--- incubator/tuscany/sandbox/lresende/das/ldap/pom.xml (original)
+++ incubator/tuscany/sandbox/lresende/das/ldap/pom.xml Sun Mar 25 09:33:29 2007
@@ -31,7 +31,7 @@
<dependency>
<groupId>org.apache.tuscany.das</groupId>
<artifactId>tuscany-das-api</artifactId>
- <version>1.0-incubator-SNAPSHOT</version>
+ <version>${version}</version>
</dependency>
<dependency>
@@ -59,36 +59,67 @@
<activation>
<activeByDefault>true</activeByDefault>
</activation>
- </profile>
-
- <profile>
- <id>javadoc</id>
-
- <build>
- <plugins>
- <!-- Generates JavaDoc for DAS LDAP -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <version>2.0</version>
- <maven.javadoc.failonerror>0</maven.javadoc.failonerror>
- <maven.javadoc.warningsreport>false</maven.javadoc.warningsreport>
- </configuration>
- <executions>
- <execution>
- <id>package</id>
- <phase>package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
+
+ <build>
+ <plugins>
+ <!-- Generate SDO DataObjects from XSD -->
+ <plugin>
+ <groupId>org.apache.tuscany.sdo</groupId>
+ <artifactId>tuscany-sdo-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>config</id>
+ <configuration>
+ <schemaFile>${basedir}/src/main/resources/config.xsd</schemaFile>
+ <noNotification>true</noNotification>
+ <noUnsettable>true</noUnsettable>
+ </configuration>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>**/*AllTestsDerby.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
-
</profile>
+
+ <profile>
+ <id>javadoc</id>
+ <build>
+ <plugins>
+ <!-- Generates JavaDoc for DAS LDAP -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <version>2.0</version>
+ <maven.javadoc.failonerror>0</maven.javadoc.failonerror>
+ <maven.javadoc.warningsreport>false</maven.javadoc.warningsreport>
+ </configuration>
+ <executions>
+ <execution>
+ <id>package</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
Added: incubator/tuscany/sandbox/lresende/das/ldap/src/main/resources/config.xsd
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/lresende/das/ldap/src/main/resources/config.xsd?view=auto&rev=522299
==============================================================================
--- incubator/tuscany/sandbox/lresende/das/ldap/src/main/resources/config.xsd (added)
+++ incubator/tuscany/sandbox/lresende/das/ldap/src/main/resources/config.xsd Sun Mar 25 09:33:29 2007
@@ -0,0 +1,57 @@
+<?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.ldap/config.xsd"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="http:///org.apache.tuscany.das.ldap/config.xsd"
+ elementFormDefault="qualified">
+
+ <xsd:include schemaLocation="http:///org.apache.tuscany.das/config.xsd"/>
+
+ <xsd:element name="Config" type="config:Config"/>
+
+ <xsd:complexType name="Config">
+ <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>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org