You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by ke...@apache.org on 2007/06/19 14:54:07 UTC

svn commit: r548710 [2/2] - in /incubator/tuscany/java/sdo: ./ distribution/ distribution/src/ distribution/src/main/ distribution/src/main/assembly/ distribution/src/main/release/ distribution/src/main/release/bin/ distribution/src/main/release/src/ i...

Propchange: incubator/tuscany/java/sdo/distribution/src/main/release/src/LICENSE
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sdo/distribution/src/main/release/src/LICENSE
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/tuscany/java/sdo/distribution/src/main/release/src/NOTICE
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/distribution/src/main/release/src/NOTICE?view=auto&rev=548710
==============================================================================
--- incubator/tuscany/java/sdo/distribution/src/main/release/src/NOTICE (added)
+++ incubator/tuscany/java/sdo/distribution/src/main/release/src/NOTICE Tue Jun 19 05:54:05 2007
@@ -0,0 +1,32 @@
+Apache Tuscany SDO for Java
+Copyright 2006, 2007 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+Apache Tuscany is an effort undergoing incubation at The Apache Software Foundation (ASF),
+sponsored by the Apache Web Services PMC. Incubation is required of all newly accepted
+projects until a further review indicates that the infrastructure, communications,
+and decision making process have stabilized in a manner consistent with other successful
+ASF projects. While incubation status is not necessarily a reflection of the completeness
+or stability of the code, it does indicate that the project has yet to be fully endorsed
+by the ASF.
+
+Unless otherwise indicated, all distribution made available by the Apache Software Foundation
+is provided to you under the terms and conditions of the Apache License Version 2.0 ("AL").
+A copy of the AL is provided with this distribution as the LICENSE.txt file present in the
+root directory, and is also available at http://www.apache.org/licenses/.
+
+The terms and conditions governing the distribution may refer to the AL or other license
+agreements, notices or terms and conditions. Some of these other license agreements may
+include (but are not limited to):
+
+  . Eclipse Public License Version 1.0 (available at http://www.eclipse.org/legal/epl-v10.html)
+
+It is your obligation to read and accept all such terms and conditions prior to use of the
+distribution. If term or condition is provided, please contact the Apache Software Foundation
+to determine what terms and conditions govern that particular distribution.
+
+This product also includes software developed by the Open Service Oriented Architecture organisation
+(http://osoa.org). The license for this software may be found in the LICENSE.txt file contained in this
+distribution.

Propchange: incubator/tuscany/java/sdo/distribution/src/main/release/src/NOTICE
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sdo/distribution/src/main/release/src/NOTICE
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: incubator/tuscany/java/sdo/impl/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/pom.xml?view=diff&rev=548710&r1=548709&r2=548710
==============================================================================
--- incubator/tuscany/java/sdo/impl/pom.xml (original)
+++ incubator/tuscany/java/sdo/impl/pom.xml Tue Jun 19 05:54:05 2007
@@ -113,7 +113,22 @@
                 <artifactId>maven-jar-plugin</artifactId>
                 <configuration>
                     <archive>
-                        <manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
+                        <manifestEntries>
+                            <Extension-Name>${project.artifactId}</Extension-Name>
+                            <Specification-Title>${project.name}</Specification-Title>
+                            <Specification-Vendor>${project.organization.name}</Specification-Vendor>
+                            <Implementation-Title>${project.artifactId}</Implementation-Title>
+                            <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
+                            <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
+                            <Implementation-Version>${project.version}</Implementation-Version>
+                            <Bundle-ManifestVersion>2</Bundle-ManifestVersion>
+                            <Bundle-Name>${project.name}</Bundle-Name>
+                            <Bundle-SymbolicName>org.apache.tuscany.sdo.impl</Bundle-SymbolicName>
+                            <Bundle-Version>1.0.0</Bundle-Version>
+                            <Bundle-Vendor>${project.organization.name}</Bundle-Vendor>
+                            <Require-Bundle>org.eclipse.emf.common,org.eclipse.emf.ecore,org.eclipse.emf.ecore.change,org.eclipse.emf.ecore.xmi,org.eclipse.xsd,org.apache.tuscany.sdo.spec;visibility:=reexport</Require-Bundle>
+                            <Export-Package>commonj.sdo.impl,org.apache.tuscany.sdo,org.apache.tuscany.sdo.helper,org.apache.tuscany.sdo.impl,org.apache.tuscany.sdo.test,org.apache.tuscany.sdo.util</Export-Package>
+                        </manifestEntries>
                     </archive>
                 </configuration>
             </plugin>

Modified: incubator/tuscany/java/sdo/lib/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/lib/pom.xml?view=diff&rev=548710&r1=548709&r2=548710
==============================================================================
--- incubator/tuscany/java/sdo/lib/pom.xml (original)
+++ incubator/tuscany/java/sdo/lib/pom.xml Tue Jun 19 05:54:05 2007
@@ -27,6 +27,7 @@
     <artifactId>tuscany-sdo-lib</artifactId>
     <name>Tuscany SDO Library</name>
     <description>Tuscany SDO implementation library.</description>
+    <packaging>jar</packaging>
 
     <repositories>
         <repository>
@@ -67,11 +68,11 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <configuration>
-                    <!-- <overview>${basedir}/src/main/java/org/apache/tuscany/sdo/overview.html</overview>   -->
+<!-- KG TODO                    <overview>${basedir}/src/main/java/org/apache/tuscany/sdo/overview.html</overview> -->
                     <version>2.0</version>
                     <source>1.4</source>
                 </configuration>
-                <!-- <executions>
+                <executions>
                     <execution>
                         <id>package</id>
                         <phase>package</phase>
@@ -79,7 +80,7 @@
                             <goal>jar</goal>
                         </goals>
                     </execution>
-                </executions>  -->
+                </executions>
             </plugin>
 
         </plugins>

Modified: incubator/tuscany/java/sdo/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/pom.xml?view=diff&rev=548710&r1=548709&r2=548710
==============================================================================
--- incubator/tuscany/java/sdo/pom.xml (original)
+++ incubator/tuscany/java/sdo/pom.xml Tue Jun 19 05:54:05 2007
@@ -79,14 +79,46 @@
         <sdo.version>${version}</sdo.version>
     </properties>
 
-    <modules>
-        <module>lib</module>
-        <module>impl</module>
-        <module>tools</module>
-        <module>plugin</module>
-        <!-- <module>sample</module>   -->
-        <!-- <module>distribution</module>  -->
-    </modules>
+    <profiles>
+        <profile>
+            <id>default</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <modules>
+                <module>sdo-api</module>
+                <module>lib</module>
+                <module>impl</module>
+                <module>tools</module>
+                <module>plugin</module>
+                <module>sample</module>
+            </modules>
+        </profile>
+
+        <profile>
+            <id>distribution</id>
+            <modules>
+                <module>sdo-api</module>
+                <module>lib</module>
+                <module>impl</module>
+                <module>tools</module>
+                <module>plugin</module>
+                <module>sample</module>
+                <module>distribution</module>
+            </modules>
+        </profile>
+
+        <profile>
+            <id>eclipse</id>
+            <modules>
+                <module>sdo-api</module>
+                <module>lib</module>
+                <module>impl</module>
+                <module>tools</module>
+                <module>sample</module>
+            </modules>
+        </profile>
+    </profiles>
 
     <build>
         <defaultGoal>install</defaultGoal>
@@ -111,31 +143,7 @@
                 </configuration>
             </plugin>
             
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <!-- <version>${dependency.plugin.version}</version>  -->
-                <executions>
-                    <execution>
-                        <id>unpack-javadoc</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>unpack</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>commonj</groupId>
-                                    <artifactId>sdo-api-r${specVersion}</artifactId>
-                                    <classifier>javadoc</classifier>
-                                    <version>${pom.version}</version>
-                                    <outputDirectory>${project.build.directory}/javadoc/api</outputDirectory>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>               
+               
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
@@ -150,16 +158,16 @@
 
         <pluginManagement>
             <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <configuration>
-                    <aggregate>true</aggregate>
-                    <version>2.0</version>
-                    <source>1.4</source>
-                </configuration>
-            </plugin>
-        </plugins>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-javadoc-plugin</artifactId>
+					<configuration>
+						<aggregate>true</aggregate>
+						<version>2.0</version>
+						<source>1.4</source>
+					</configuration>
+				</plugin>
+            </plugins>
         </pluginManagement>
 
     </build>

Modified: incubator/tuscany/java/sdo/sample/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/sample/pom.xml?view=diff&rev=548710&r1=548709&r2=548710
==============================================================================
--- incubator/tuscany/java/sdo/sample/pom.xml (original)
+++ incubator/tuscany/java/sdo/sample/pom.xml Tue Jun 19 05:54:05 2007
@@ -83,27 +83,25 @@
                     </archive>
                 </configuration>
             </plugin>
-<!--
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-    
-                <executions>
-                        <execution>
-                            <phase>package</phase>
-                            <goals>
-                                <goal>assembly</goal>
-                            </goals>
-                        </execution>
-                </executions>
-    
+                <artifactId>maven-javadoc-plugin</artifactId>
                 <configuration>
-                    <descriptors>
-                        <descriptor>distribution/assembly/sdoSamples.xml</descriptor>
-                    </descriptors>
+<!-- KG TODO                    <overview>${basedir}/src/main/java/org/apache/tuscany/sdo/overview.html</overview> -->
+                    <version>2.0</version>
+                    <source>1.4</source>
                 </configuration>
+                <executions>
+                    <execution>
+                        <id>package</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
             </plugin>
--->
+
         </plugins>
     </build>
 </project>

Modified: incubator/tuscany/java/sdo/tools/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/tools/pom.xml?view=diff&rev=548710&r1=548709&r2=548710
==============================================================================
--- incubator/tuscany/java/sdo/tools/pom.xml (original)
+++ incubator/tuscany/java/sdo/tools/pom.xml Tue Jun 19 05:54:05 2007
@@ -78,7 +78,22 @@
                 <artifactId>maven-jar-plugin</artifactId>
                 <configuration>
                     <archive>
-                        <manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
+                        <manifestEntries>
+                            <Extension-Name>${project.artifactId}</Extension-Name>
+                            <Specification-Title>${project.name}</Specification-Title>
+                            <Specification-Vendor>${project.organization.name}</Specification-Vendor>
+                            <Implementation-Title>${project.artifactId}</Implementation-Title>
+                            <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
+                            <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
+                            <Implementation-Version>${project.version}</Implementation-Version>
+                            <Bundle-ManifestVersion>2</Bundle-ManifestVersion>
+                            <Bundle-Name>${project.name}</Bundle-Name>
+                            <Bundle-SymbolicName>org.apache.tuscany.sdo.tools</Bundle-SymbolicName>
+                            <Bundle-Version>1.0.0</Bundle-Version>
+                            <Bundle-Vendor>${project.organization.name}</Bundle-Vendor>
+                            <Require-Bundle>org.eclipse.emf.common,org.eclipse.emf.ecore,org.eclipse.emf.ecore.change,org.eclipse.emf.ecore.xmi,org.eclipse.xsd,org.apache.tuscany.sdo.spec;visibility:=reexport</Require-Bundle>
+                            <Export-Package>org.apache.tuscany.sdo.generate,org.apache.tuscany.sdo.generate.util</Export-Package>
+                        </manifestEntries>
                     </archive>
                 </configuration>
             </plugin>



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org