geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiam...@apache.org
Subject svn commit: r959734 - in /geronimo/samples/trunk: ./ geronimo-samples-archetype/src/main/resources/archetype-resources/sample-war/src/main/webapp/WEB-INF/ samples/daytrader/assemblies/web/daytrader-web-jpa/src/main/webapp/WEB-INF/ samples/daytrader/ass...
Date Thu, 01 Jul 2010 17:42:54 GMT
Author: xiaming
Date: Thu Jul  1 17:42:53 2010
New Revision: 959734

URL: http://svn.apache.org/viewvc?rev=959734&view=rev
Log:
Merge rat:check updates from 3.0-M1 branch to trunk

Removed:
    geronimo/samples/trunk/samples/daytrader/modules/streamer/src/main/resources/META-INF/MANIFEST.MF
    geronimo/samples/trunk/samples/daytrader/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/prim/
    geronimo/samples/trunk/samples/daytrader/modules/wsappclient/src/main/resources/META-INF/MANIFEST.MF
    geronimo/samples/trunk/samples/osgi/aries-datasource/src/main/history/
    geronimo/samples/trunk/samples/sample-datasource/src/main/history/
Modified:
    geronimo/samples/trunk/   (props changed)
    geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-war/src/main/webapp/WEB-INF/geronimo-web.xml
    geronimo/samples/trunk/pom.xml
    geronimo/samples/trunk/samples/daytrader/assemblies/web/daytrader-web-jpa/src/main/webapp/WEB-INF/ibm-web-bnd.xmi
    geronimo/samples/trunk/samples/daytrader/assemblies/web/daytrader-web-jpa/src/main/webapp/WEB-INF/ibm-web-ext.xmi
    geronimo/samples/trunk/samples/daytrader/assemblies/web/daytrader-web-jpa/src/main/webapp/dbscripts/postgre/Table.ddl
    geronimo/samples/trunk/samples/javaee5/sample-datasource/   (props changed)

Propchange: geronimo/samples/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul  1 17:42:53 2010
@@ -1 +1 @@
-/geronimo/samples/branches/3.0-M1:957816,958169,958321,958804,958815
+/geronimo/samples/branches/3.0-M1:957816,958169,958321,958804,958815,959688,959691,959707,959709,959713

Modified: geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-war/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=959734&r1=959733&r2=959734&view=diff
==============================================================================
--- geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-war/src/main/webapp/WEB-INF/geronimo-web.xml
(original)
+++ geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-war/src/main/webapp/WEB-INF/geronimo-web.xml
Thu Jul  1 17:42:53 2010
@@ -1,3 +1,22 @@
+<?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.
+-->
 <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1" 
          xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2" 
          xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0" 

Modified: geronimo/samples/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/pom.xml?rev=959734&r1=959733&r2=959734&view=diff
==============================================================================
--- geronimo/samples/trunk/pom.xml (original)
+++ geronimo/samples/trunk/pom.xml Thu Jul  1 17:42:53 2010
@@ -307,7 +307,46 @@
                         </configuration>
                     </execution>
                 </executions>
-            </plugin>            
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>rat-maven-plugin</artifactId>
+                <version>1.0-alpha-3</version>
+                <configuration>
+                    <excludes>
+                        <exclude>src/main/history/dependencies.xml</exclude>
+                        <exclude>release.properties</exclude>
+                        <exclude>pom.xml.releaseBackup</exclude>
+                    </excludes>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-clean-plugin</artifactId>
+                <version>2.4.1</version>
+                <configuration>
+                <filesets>
+                    <fileset>
+                        <directory>src/main</directory>
+                        <includes>
+                            <include>history</include>                      
     
+                        </includes>
+                        <!--<excludes>
+                            <exclude>**/important.log</exclude>
+                            <exclude>**/another-important.log</exclude>
+                        </excludes>-->
+                        <followSymlinks>false</followSymlinks>
+                    </fileset>
+                </filesets>
+                </configuration>
+        </plugin>            
         </plugins>
     </build>
 

Modified: geronimo/samples/trunk/samples/daytrader/assemblies/web/daytrader-web-jpa/src/main/webapp/WEB-INF/ibm-web-bnd.xmi
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/daytrader/assemblies/web/daytrader-web-jpa/src/main/webapp/WEB-INF/ibm-web-bnd.xmi?rev=959734&r1=959733&r2=959734&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/daytrader/assemblies/web/daytrader-web-jpa/src/main/webapp/WEB-INF/ibm-web-bnd.xmi
(original)
+++ geronimo/samples/trunk/samples/daytrader/assemblies/web/daytrader-web-jpa/src/main/webapp/WEB-INF/ibm-web-bnd.xmi
Thu Jul  1 17:42:53 2010
@@ -1,4 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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.
+-->
 <webappbnd:WebAppBinding xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:webappbnd="webappbnd.xmi"
xmi:id="WebAppBinding_1253388157906" virtualHostName="default_host">
   <webapp href="WEB-INF/web.xml#WebApp_ID"/>
   <resRefBindings xmi:id="ResourceRefBinding_1253420979765">

Modified: geronimo/samples/trunk/samples/daytrader/assemblies/web/daytrader-web-jpa/src/main/webapp/WEB-INF/ibm-web-ext.xmi
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/daytrader/assemblies/web/daytrader-web-jpa/src/main/webapp/WEB-INF/ibm-web-ext.xmi?rev=959734&r1=959733&r2=959734&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/daytrader/assemblies/web/daytrader-web-jpa/src/main/webapp/WEB-INF/ibm-web-ext.xmi
(original)
+++ geronimo/samples/trunk/samples/daytrader/assemblies/web/daytrader-web-jpa/src/main/webapp/WEB-INF/ibm-web-ext.xmi
Thu Jul  1 17:42:53 2010
@@ -1,4 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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.
+-->
 <webappext:WebAppExtension xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:webappext="webappext.xmi"
xmi:id="WebAppExtension_1253388157890" reloadInterval="3" reloadingEnabled="true" additionalClassPath=""
fileServingEnabled="true" directoryBrowsingEnabled="false" serveServletsByClassnameEnabled="true">
   <webApp href="WEB-INF/web.xml#WebApp_ID"/>
 </webappext:WebAppExtension>

Modified: geronimo/samples/trunk/samples/daytrader/assemblies/web/daytrader-web-jpa/src/main/webapp/dbscripts/postgre/Table.ddl
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/daytrader/assemblies/web/daytrader-web-jpa/src/main/webapp/dbscripts/postgre/Table.ddl?rev=959734&r1=959733&r2=959734&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/daytrader/assemblies/web/daytrader-web-jpa/src/main/webapp/dbscripts/postgre/Table.ddl
(original)
+++ geronimo/samples/trunk/samples/daytrader/assemblies/web/daytrader-web-jpa/src/main/webapp/dbscripts/postgre/Table.ddl
Thu Jul  1 17:42:53 2010
@@ -1,3 +1,21 @@
+--    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.
+
+-- Each SQL statement in this file should terminate with a semicolon (;)
+-- Lines starting with the pound character (#) are considered as comments
+
 -- If you first time initialize postgre db, the drop statements should be commented out as
following.
 -- DROP TABLE holdingejb;
 -- DROP TABLE accountprofileejb;

Propchange: geronimo/samples/trunk/samples/javaee5/sample-datasource/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul  1 17:42:53 2010
@@ -1 +1 @@
-/geronimo/samples/branches/3.0-M1/samples/javaee5/sample-datasource:958169,958321,958804,958815
+/geronimo/samples/branches/3.0-M1/samples/javaee5/sample-datasource:958169,958321,958804,958815,959688,959691,959707,959709,959713



Mime
View raw message