geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r816942 [2/2] - in /geronimo/server/trunk: framework/modules/geronimo-service-builder/ plugins/activemq/ plugins/activemq/activemq-webconsole-jetty/ plugins/activemq/activemq-webconsole-tomcat/ plugins/ca-helper/geronimo-ca-helper/ plugins/...
Date Sat, 19 Sep 2009 16:54:02 GMT
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/pom.xml?rev=816942&r1=816941&r2=816942&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/pom.xml Sat Sep 19 16:53:58
2009
@@ -66,21 +66,6 @@
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>xmlbeans-maven-plugin</artifactId>
             </plugin>
-            
-            <!--
-            HACK: Copy XmlBeans generated schemas.
-            -->
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>buildsupport-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>copy-xmlbeans-schemas</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 

Modified: geronimo/server/trunk/plugins/jetty/geronimo-jetty6-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty/geronimo-jetty6-builder/pom.xml?rev=816942&r1=816941&r2=816942&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty/geronimo-jetty6-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/jetty/geronimo-jetty6-builder/pom.xml Sat Sep 19 16:53:58
2009
@@ -75,21 +75,6 @@
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>xmlbeans-maven-plugin</artifactId>
             </plugin>
-            
-            <!--
-            HACK: Copy XmlBeans generated schemas.
-            -->
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>buildsupport-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>copy-xmlbeans-schemas</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 

Modified: geronimo/server/trunk/plugins/jetty/geronimo-jetty6-clustering-builder-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty/geronimo-jetty6-clustering-builder-wadi/pom.xml?rev=816942&r1=816941&r2=816942&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty/geronimo-jetty6-clustering-builder-wadi/pom.xml (original)
+++ geronimo/server/trunk/plugins/jetty/geronimo-jetty6-clustering-builder-wadi/pom.xml Sat
Sep 19 16:53:58 2009
@@ -54,21 +54,6 @@
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>xmlbeans-maven-plugin</artifactId>
             </plugin>
-            
-            <!--
-            HACK: Copy XmlBeans generated schemas.
-            -->
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>buildsupport-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>copy-xmlbeans-schemas</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 

Modified: geronimo/server/trunk/plugins/jetty7/geronimo-jetty7-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty7/geronimo-jetty7-builder/pom.xml?rev=816942&r1=816941&r2=816942&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty7/geronimo-jetty7-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/jetty7/geronimo-jetty7-builder/pom.xml Sat Sep 19 16:53:58
2009
@@ -86,21 +86,6 @@
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>xmlbeans-maven-plugin</artifactId>
             </plugin>
-            
-            <!--
-            HACK: Copy XmlBeans generated schemas.
-            -->
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>buildsupport-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>copy-xmlbeans-schemas</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 

Modified: geronimo/server/trunk/plugins/jetty7/geronimo-jetty7-clustering-builder-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty7/geronimo-jetty7-clustering-builder-wadi/pom.xml?rev=816942&r1=816941&r2=816942&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty7/geronimo-jetty7-clustering-builder-wadi/pom.xml (original)
+++ geronimo/server/trunk/plugins/jetty7/geronimo-jetty7-clustering-builder-wadi/pom.xml Sat
Sep 19 16:53:58 2009
@@ -53,21 +53,6 @@
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>xmlbeans-maven-plugin</artifactId>
             </plugin>
-            
-            <!--
-            HACK: Copy XmlBeans generated schemas.
-            -->
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>buildsupport-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>copy-xmlbeans-schemas</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 

Modified: geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyContainerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyContainerImpl.java?rev=816942&r1=816941&r2=816942&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyContainerImpl.java
(original)
+++ geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyContainerImpl.java
Sat Sep 19 16:53:58 2009
@@ -183,15 +183,15 @@
 
             /* set active request range values */
             stats.getActiveRequestCountImpl().setCurrent((long) statsHandler.getRequestsActive());
-            stats.getActiveRequestCountImpl().setLowWaterMark((long) statsHandler.getRequestsActiveMin());
+//            stats.getActiveRequestCountImpl().setLowWaterMark((long) statsHandler.getRequestsActiveMin());
             stats.getActiveRequestCountImpl().setHighWaterMark((long) statsHandler.getRequestsActiveMax());
 
             /* set request duration time values, avg = Totaltime/Count */
             /* set active request count */
             stats.getRequestDurationImpl().setCount((long) statsHandler.getRequests());
-            stats.getRequestDurationImpl().setMaxTime((long) statsHandler.getRequestsDurationMax());
-            stats.getRequestDurationImpl().setMinTime((long) statsHandler.getRequestsDurationMin());
-            stats.getRequestDurationImpl().setTotalTime((long) statsHandler.getRequestsDurationTotal());
+//            stats.getRequestDurationImpl().setMaxTime((long) statsHandler.getRequestsDurationMax());
+//            stats.getRequestDurationImpl().setMinTime((long) statsHandler.getRequestsDurationMin());
+//            stats.getRequestDurationImpl().setTotalTime((long) statsHandler.getRequestsDurationTotal());
 
             /* set request count values*/
             stats.getResponses1xxImpl().setCount((long) statsHandler.getResponses1xx());

Modified: geronimo/server/trunk/plugins/jetty7/jetty7-clustering-wadi/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty7/jetty7-clustering-wadi/src/main/history/dependencies.xml?rev=816942&r1=816941&r2=816942&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty7/jetty7-clustering-wadi/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/jetty7/jetty7-clustering-wadi/src/main/history/dependencies.xml
Sat Sep 19 16:53:58 2009
@@ -53,6 +53,11 @@
     </dependency>
     <dependency>
         <groupId>org.eclipse.jetty</groupId>
+        <artifactId>jetty-webapp-verifier</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-xml</artifactId>
         <type>jar</type>
     </dependency>

Modified: geronimo/server/trunk/plugins/jetty7/jetty7/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty7/jetty7/src/main/history/dependencies.xml?rev=816942&r1=816941&r2=816942&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty7/jetty7/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/jetty7/jetty7/src/main/history/dependencies.xml Sat Sep
19 16:53:58 2009
@@ -83,6 +83,11 @@
     </dependency>
     <dependency>
         <groupId>org.eclipse.jetty</groupId>
+        <artifactId>jetty-webapp-verifier</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-xml</artifactId>
         <type>jar</type>
     </dependency>

Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/pom.xml?rev=816942&r1=816941&r2=816942&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/pom.xml Sat Sep 19 16:53:58
2009
@@ -90,21 +90,6 @@
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>xmlbeans-maven-plugin</artifactId>
             </plugin>
-            
-            <!--
-            HACK: Copy XmlBeans generated schemas.
-            -->
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>buildsupport-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>copy-xmlbeans-schemas</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 

Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-builder-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-builder-wadi/pom.xml?rev=816942&r1=816941&r2=816942&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-builder-wadi/pom.xml
(original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-builder-wadi/pom.xml
Sat Sep 19 16:53:58 2009
@@ -52,21 +52,6 @@
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>xmlbeans-maven-plugin</artifactId>
             </plugin>
-            
-            <!--
-            HACK: Copy XmlBeans generated schemas.
-            -->
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>buildsupport-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>copy-xmlbeans-schemas</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/pom.xml?rev=816942&r1=816941&r2=816942&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/pom.xml Sat Sep 19 16:53:58
2009
@@ -149,21 +149,6 @@
                 </executions>
             </plugin>
             
-            <!--
-            HACK: Copy XmlBeans generated schemas.
-            -->
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>buildsupport-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>copy-xmlbeans-schemas</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-clustering-builder-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-clustering-builder-wadi/pom.xml?rev=816942&r1=816941&r2=816942&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-clustering-builder-wadi/pom.xml
(original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-clustering-builder-wadi/pom.xml
Sat Sep 19 16:53:58 2009
@@ -68,21 +68,6 @@
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>xmlbeans-maven-plugin</artifactId>
             </plugin>
-            
-            <!--
-            HACK: Copy XmlBeans generated schemas.
-            -->
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>buildsupport-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>copy-xmlbeans-schemas</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 

Modified: geronimo/server/trunk/plugins/webservices/geronimo-webservices-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/webservices/geronimo-webservices-builder/pom.xml?rev=816942&r1=816941&r2=816942&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/webservices/geronimo-webservices-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/webservices/geronimo-webservices-builder/pom.xml Sat Sep
19 16:53:58 2009
@@ -73,21 +73,6 @@
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>xmlbeans-maven-plugin</artifactId>
             </plugin>
-            
-            <!--
-            HACK: Copy XmlBeans generated schemas.
-            -->
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>buildsupport-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>copy-xmlbeans-schemas</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 

Modified: geronimo/server/trunk/plugins/welcome/geronimo-welcome/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/welcome/geronimo-welcome/pom.xml?rev=816942&r1=816941&r2=816942&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/welcome/geronimo-welcome/pom.xml (original)
+++ geronimo/server/trunk/plugins/welcome/geronimo-welcome/pom.xml Sat Sep 19 16:53:58 2009
@@ -71,7 +71,7 @@
                 <artifactId>maven-war-plugin</artifactId>
                 <configuration>
                     <webXml>${project.build.directory}/jspweb.xml</webXml>
-                    <!--<warSourceExcludes>**/*.jsp</warSourceExcludes>-->
+                    <warSourceExcludes>**/*.jsp</warSourceExcludes>
                 </configuration>
             </plugin>
         </plugins>



Mime
View raw message