geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r813223 - in /geronimo/daytrader/trunk/plugins: ./ daytrader-db2-datasource/ daytrader-derby-datasource/ daytrader-jetty/ daytrader-jms/ daytrader-oracle-datasource/ daytrader-tomcat/ daytrader-web-jdbc-jetty/ daytrader-web-jdbc-tomcat/ db/...
Date Thu, 10 Sep 2009 04:19:30 GMT
Author: dwoods
Date: Thu Sep 10 04:19:29 2009
New Revision: 813223

URL: http://svn.apache.org/viewvc?rev=813223&view=rev
Log:
put plugins back into a single dir

Added:
    geronimo/daytrader/trunk/plugins/daytrader-db2-datasource/
      - copied from r813221, geronimo/daytrader/trunk/plugins/db/daytrader-db2-datasource/
    geronimo/daytrader/trunk/plugins/daytrader-derby-datasource/
      - copied from r813221, geronimo/daytrader/trunk/plugins/db/daytrader-derby-datasource/
    geronimo/daytrader/trunk/plugins/daytrader-jetty/
      - copied from r813220, geronimo/daytrader/trunk/plugins/javaee/daytrader-jetty/
    geronimo/daytrader/trunk/plugins/daytrader-jms/
      - copied from r813220, geronimo/daytrader/trunk/plugins/javaee/daytrader-jms/
    geronimo/daytrader/trunk/plugins/daytrader-oracle-datasource/
      - copied from r813221, geronimo/daytrader/trunk/plugins/db/daytrader-oracle-datasource/
    geronimo/daytrader/trunk/plugins/daytrader-tomcat/
      - copied from r813220, geronimo/daytrader/trunk/plugins/javaee/daytrader-tomcat/
    geronimo/daytrader/trunk/plugins/daytrader-web-jdbc-jetty/
      - copied from r813220, geronimo/daytrader/trunk/plugins/web/plugins/daytrader-web-jdbc-jetty/
    geronimo/daytrader/trunk/plugins/daytrader-web-jdbc-tomcat/
      - copied from r813220, geronimo/daytrader/trunk/plugins/web/plugins/daytrader-web-jdbc-tomcat/
    geronimo/daytrader/trunk/plugins/pom.xml   (with props)
Removed:
    geronimo/daytrader/trunk/plugins/db/
    geronimo/daytrader/trunk/plugins/javaee/
    geronimo/daytrader/trunk/plugins/web/
Modified:
    geronimo/daytrader/trunk/plugins/daytrader-db2-datasource/pom.xml
    geronimo/daytrader/trunk/plugins/daytrader-derby-datasource/pom.xml
    geronimo/daytrader/trunk/plugins/daytrader-web-jdbc-jetty/pom.xml
    geronimo/daytrader/trunk/plugins/daytrader-web-jdbc-tomcat/pom.xml

Modified: geronimo/daytrader/trunk/plugins/daytrader-db2-datasource/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/plugins/daytrader-db2-datasource/pom.xml?rev=813223&r1=813221&r2=813223&view=diff
==============================================================================
--- geronimo/daytrader/trunk/plugins/daytrader-db2-datasource/pom.xml (original)
+++ geronimo/daytrader/trunk/plugins/daytrader-db2-datasource/pom.xml Thu Sep 10 04:19:29
2009
@@ -27,7 +27,7 @@
     <groupId>org.apache.geronimo.daytrader.plugins</groupId>
     <artifactId>daytrader-db2-datasource</artifactId>
     <packaging>car</packaging>
-    <name>Daytrader :: Plugins - DB2 DataSource</name>
+    <name>Daytrader :: Plugins :: DB :: DB2 DataSource</name>
 
     <dependencies>
         <dependency>
@@ -71,6 +71,7 @@
             <type>jar</type>
         </dependency>
     </dependencies>
+
     <build>
         <plugins>
             <plugin>

Modified: geronimo/daytrader/trunk/plugins/daytrader-derby-datasource/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/plugins/daytrader-derby-datasource/pom.xml?rev=813223&r1=813221&r2=813223&view=diff
==============================================================================
--- geronimo/daytrader/trunk/plugins/daytrader-derby-datasource/pom.xml (original)
+++ geronimo/daytrader/trunk/plugins/daytrader-derby-datasource/pom.xml Thu Sep 10 04:19:29
2009
@@ -27,7 +27,7 @@
     <groupId>org.apache.geronimo.daytrader.plugins</groupId>
     <artifactId>daytrader-derby-datasource</artifactId>
     <packaging>car</packaging>
-    <name>Daytrader :: Plugins - Derby DataSource</name>
+    <name>Daytrader :: Plugins :: DB :: Derby DataSource</name>
 
     <dependencies>
         <dependency>
@@ -65,6 +65,7 @@
             <version>${geronimoVersion}</version>
         </dependency>
     </dependencies>
+
     <build>
         <plugins>
             <plugin>

Modified: geronimo/daytrader/trunk/plugins/daytrader-web-jdbc-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/plugins/daytrader-web-jdbc-jetty/pom.xml?rev=813223&r1=813220&r2=813223&view=diff
==============================================================================
--- geronimo/daytrader/trunk/plugins/daytrader-web-jdbc-jetty/pom.xml (original)
+++ geronimo/daytrader/trunk/plugins/daytrader-web-jdbc-jetty/pom.xml Thu Sep 10 04:19:29
2009
@@ -17,7 +17,7 @@
 -->
 
 <!-- $Rev$ $Date$ -->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
 	<groupId>org.apache.geronimo.daytrader</groupId>        
 	<artifactId>plugins</artifactId>        

Modified: geronimo/daytrader/trunk/plugins/daytrader-web-jdbc-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/plugins/daytrader-web-jdbc-tomcat/pom.xml?rev=813223&r1=813220&r2=813223&view=diff
==============================================================================
--- geronimo/daytrader/trunk/plugins/daytrader-web-jdbc-tomcat/pom.xml (original)
+++ geronimo/daytrader/trunk/plugins/daytrader-web-jdbc-tomcat/pom.xml Thu Sep 10 04:19:29
2009
@@ -17,7 +17,7 @@
 -->
 
 <!-- $Rev$ $Date$ -->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
 	<groupId>org.apache.geronimo.daytrader</groupId>        
 	<artifactId>plugins</artifactId>        

Added: geronimo/daytrader/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/plugins/pom.xml?rev=813223&view=auto
==============================================================================
--- geronimo/daytrader/trunk/plugins/pom.xml (added)
+++ geronimo/daytrader/trunk/plugins/pom.xml Thu Sep 10 04:19:29 2009
@@ -0,0 +1,94 @@
+<?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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.daytrader</groupId>
+        <artifactId>daytrader-parent</artifactId>
+        <version>2.2-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.geronimo.daytrader</groupId>
+    <artifactId>plugins</artifactId>
+    <name>DayTrader :: Plugins</name>
+    <packaging>pom</packaging>
+
+    <modules>
+        <!-- c-m-p built plugins -->
+        <module>daytrader-derby-datasource</module>
+        <!-- see profiles -->
+        <!--<module>daytrader-db2-datasource</module>-->
+        <!--<module>daytrader-oracle-datasource</module>-->
+        <module>daytrader-jms</module>
+        <module>daytrader-jetty</module>
+        <module>daytrader-tomcat</module>
+	<module>daytrader-web-jdbc-jetty</module>
+        <module>daytrader-web-jdbc-tomcat</module>
+    </modules>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <!-- Allow any Java >= 1.5 -->
+                                <requireJavaVersion>
+                                    <version>[1.5,)</version>
+                                </requireJavaVersion>
+
+                                <!-- Allow any Maven >= 2.0.9 -->
+                                <requireMavenVersion>
+                                    <version>[2.0.9,)</version>
+                                </requireMavenVersion>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.5</source>
+                    <target>1.5</target>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-idea-plugin</artifactId>
+                <configuration>
+                    <jdkName>1.5</jdkName>
+                    <linkModules>true</linkModules>
+                </configuration>
+            </plugin>
+
+        </plugins>
+    </build>
+</project>

Propchange: geronimo/daytrader/trunk/plugins/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message