[jboss-cvs] JBossAS SVN: r104191 - in branches/KABIR_JAVASSIST_REFLECT: component-matrix and 8 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Fri Apr 23 07:00:31 EDT 2010 

Author: kabir.khan at jboss.com
Date: 2010-04-23 07:00:30 -0400 (Fri, 23 Apr 2010)
New Revision: 104191

Modified:
   branches/KABIR_JAVASSIST_REFLECT/
   branches/KABIR_JAVASSIST_REFLECT/component-matrix/pom.xml
   branches/KABIR_JAVASSIST_REFLECT/dist/pom.xml
   branches/KABIR_JAVASSIST_REFLECT/embedded/pom.xml
   branches/KABIR_JAVASSIST_REFLECT/embedded/src/test/java/org/jboss/jbossas/embedded/testsuite/ServerIntegrationTest.java
   branches/KABIR_JAVASSIST_REFLECT/pom.xml
   branches/KABIR_JAVASSIST_REFLECT/server/src/etc/deployers/metadata-deployer-jboss-beans.xml
   branches/KABIR_JAVASSIST_REFLECT/testsuite/src/main/org/jboss/test/osgi/simple/SimpleRuntimeTestCase.java
   branches/KABIR_JAVASSIST_REFLECT/tomcat/src/webapps/ROOT.war/WEB-INF/web.xml
   branches/KABIR_JAVASSIST_REFLECT/tomcat/src/webapps/ROOT.war/index.html
   branches/KABIR_JAVASSIST_REFLECT/varia/src/resources/jmx/jmx-console-web.xml
Log:
Merged revisions 104109,104139,104153,104171,104178,104181,104185 via svnmerge from 
https://svn.jboss.org/repos/jbossas/trunk

.......
  r104109 | alex.loubyansky at jboss.com | 2010-04-21 13:15:04 +0100 (Wed, 21 Apr 2010) | 1 line
  
  JBAS-7956
.......
  r104139 | remy.maucherat at jboss.com | 2010-04-22 11:35:37 +0100 (Thu, 22 Apr 2010) | 3 lines
  
  - Fix jmx-console example constraint.
  - Comment out status Servlet.
  - Update links.
.......
  r104153 | marius.bogoevici | 2010-04-22 14:50:28 +0100 (Thu, 22 Apr 2010) | 1 line
  
  Snowdrop 2.0.0-M1 had dependency issues, moving to 2.0.0-M1-SP1 to fix hudson tests
.......
  r104171 | pgier | 2010-04-22 18:46:39 +0100 (Thu, 22 Apr 2010) | 1 line
  
  Update distmanagement to point to new repo
.......
  r104178 | ALRubinger | 2010-04-22 20:54:41 +0100 (Thu, 22 Apr 2010) | 1 line
  
  [JBAS-7963] Update to latest org.jboss.embedded:1.0.0-alpha-3 and ShrinKWrap:1.0.0-alpha-9.  A one-time exception, see JIRA for reasons why this was permitted so close to M3 cutoff.
.......
  r104181 | ALRubinger | 2010-04-22 21:46:04 +0100 (Thu, 22 Apr 2010) | 1 line
  
  [JBAS-7963] Missed the testsuite commit
.......
  r104185 | wolfc | 2010-04-23 09:30:05 +0100 (Fri, 23 Apr 2010) | 2 lines
  
  JBAS-7966: updated pom to use the new nexus repositories
.......



Property changes on: branches/KABIR_JAVASSIST_REFLECT
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk:1-104105
   + /trunk:1-104190

Modified: branches/KABIR_JAVASSIST_REFLECT/component-matrix/pom.xml
===================================================================
--- branches/KABIR_JAVASSIST_REFLECT/component-matrix/pom.xml	2010-04-23 10:53:47 UTC (rev 104190)
+++ branches/KABIR_JAVASSIST_REFLECT/component-matrix/pom.xml	2010-04-23 11:00:30 UTC (rev 104191)
@@ -100,7 +100,7 @@
     <version.org.jboss.deployers>2.2.0.Alpha4</version.org.jboss.deployers>
     <version.org.jboss.ejb3.bom>0.1.2</version.org.jboss.ejb3.bom>
     <version.org.jboss.ejb.api>1.0-alpha-1</version.org.jboss.ejb.api>
-    <version.org.jboss.embedded>1.0.0-alpha-2</version.org.jboss.embedded>
+    <version.org.jboss.embedded>1.0.0-alpha-3</version.org.jboss.embedded>
     <version.org.jboss.integration>6.0.0.Alpha9</version.org.jboss.integration>
     <version.org.jboss.jbossxb>2.0.2.Beta7</version.org.jboss.jbossxb>
     <version.org.jboss.jopr>1.4.0.Beta3</version.org.jboss.jopr>
@@ -135,7 +135,7 @@
     <version.org.jboss.security>3.0.0.Beta4</version.org.jboss.security>
     <version.org.jboss.security.negotiation>2.0.3.SP1</version.org.jboss.security.negotiation>
     <version.org.jboss.service.binding>1.1.0.CR1</version.org.jboss.service.binding>
-    <version.org.jboss.shrinkwrap>1.0.0-alpha-7</version.org.jboss.shrinkwrap>
+    <version.org.jboss.shrinkwrap>1.0.0-alpha-9</version.org.jboss.shrinkwrap>
     <version.org.jboss.slf4j>1.0.2.GA</version.org.jboss.slf4j>
     <version.org.jboss.stdio>1.0.0.CR3</version.org.jboss.stdio>
     <version.org.jboss.threads>2.0.0.CR4</version.org.jboss.threads>
@@ -148,7 +148,7 @@
     <version.oswego-concurrent.concurrent>1.3.4-jboss-update1</version.oswego-concurrent.concurrent>
     <version.saaj.api>1.3</version.saaj.api>
     <version.seam.integration>6.0.0.Alpha1</version.seam.integration>
-    <version.spring.integration>2.0.0-M1</version.spring.integration>
+    <version.spring.integration>2.0.0-M1-SP1</version.spring.integration>
     <version.staxex>2.1.1</version.staxex>
     <version.streambuffer>1.0</version.streambuffer>
     <version.org.jboss.spec.javaee>1.0.0.Beta1</version.org.jboss.spec.javaee>

Modified: branches/KABIR_JAVASSIST_REFLECT/dist/pom.xml
===================================================================
--- branches/KABIR_JAVASSIST_REFLECT/dist/pom.xml	2010-04-23 10:53:47 UTC (rev 104190)
+++ branches/KABIR_JAVASSIST_REFLECT/dist/pom.xml	2010-04-23 11:00:30 UTC (rev 104191)
@@ -142,7 +142,7 @@
     <snapshotRepository>
       <id>jboss-snapshots</id>
       <name>JBoss Snapshot Repository</name>
-      <url>dav:https://snapshots.jboss.org/maven2</url>
+      <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
       <!-- Need to set unique version to false to prevent large amounts of data building up in the snapshot repo -->
       <uniqueVersion>false</uniqueVersion>
     </snapshotRepository>

Modified: branches/KABIR_JAVASSIST_REFLECT/embedded/pom.xml
===================================================================
--- branches/KABIR_JAVASSIST_REFLECT/embedded/pom.xml	2010-04-23 10:53:47 UTC (rev 104190)
+++ branches/KABIR_JAVASSIST_REFLECT/embedded/pom.xml	2010-04-23 11:00:30 UTC (rev 104191)
@@ -171,7 +171,7 @@
                     data like classes, methods, etc. EMB-41. Endorsed
                     required for things like WS support (EMB-61)
                   -->
-                  <argLine>-Xmx512m -XX:MaxPermSize=256m -Djava.net.preferIPv4Stack=true -Djava.util.logging.manager=org.jboss.logmanager.LogManager -Djava.endorsed.dirs=${JBOSS_HOME}/lib/endorsed -Djboss.home=${JBOSS_HOME}</argLine>
+                  <argLine>-Xmx512m -XX:MaxPermSize=256m -Djava.net.preferIPv4Stack=true -Djava.util.logging.manager=org.jboss.logmanager.LogManager -Djava.endorsed.dirs=${JBOSS_HOME}/lib/endorsed -Djboss.home=${JBOSS_HOME} -Djboss.boot.server.log.dir=${JBOSS_HOME}</argLine>
                 </configuration>
               </execution>
             </executions>

Modified: branches/KABIR_JAVASSIST_REFLECT/embedded/src/test/java/org/jboss/jbossas/embedded/testsuite/ServerIntegrationTest.java
===================================================================
--- branches/KABIR_JAVASSIST_REFLECT/embedded/src/test/java/org/jboss/jbossas/embedded/testsuite/ServerIntegrationTest.java	2010-04-23 10:53:47 UTC (rev 104190)
+++ branches/KABIR_JAVASSIST_REFLECT/embedded/src/test/java/org/jboss/jbossas/embedded/testsuite/ServerIntegrationTest.java	2010-04-23 11:00:30 UTC (rev 104191)
@@ -68,7 +68,7 @@
 import org.jboss.jbossas.embedded.testsuite.servlet.JspForwardingServlet;
 import org.jboss.shrinkwrap.api.ArchivePath;
 import org.jboss.shrinkwrap.api.ArchivePaths;
-import org.jboss.shrinkwrap.api.Archives;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.AfterClass;
@@ -255,7 +255,7 @@
 
       // Make a deployment
       final String name = "slsb.jar";
-      final JavaArchive archive = Archives.create(name, JavaArchive.class).addClasses(OutputBean.class,
+      final JavaArchive archive = ShrinkWrap.create(name, JavaArchive.class).addClasses(OutputBean.class,
             OutputLocalBusiness.class);
       log.info(archive.toString(true));
       // Deploy
@@ -292,7 +292,7 @@
       final String appName = "testServletJsp";
       final String name = appName + ".war";
       final Class<?> servletClass = JspForwardingServlet.class;
-      final WebArchive archive = Archives.create(name, WebArchive.class);
+      final WebArchive archive = ShrinkWrap.create(name, WebArchive.class);
       final ArchivePath targetPathWebXml = ArchivePaths.create("web.xml");
       archive.addWebResource(PATH_ACTUAL_WEB_XML, targetPathWebXml).addResource(PATH_JSP).addClass(servletClass);
       log.info(archive.toString(true));
@@ -347,7 +347,7 @@
 
       // Create a virtual archive for the MDB deployment
       final String name = "jms-mdb-test.jar";
-      final JavaArchive archive = Archives.create(name, JavaArchive.class);
+      final JavaArchive archive = ShrinkWrap.create(name, JavaArchive.class);
       final ArchivePath queuesTargetPath = ArchivePaths.create(FILENAME_QUEUE_SERVICE_XML);
       archive.addClass(MessageStoringMdb.class).addResource(PATH_QUEUE_SERVICE_XML, queuesTargetPath);
 
@@ -407,7 +407,7 @@
       final String name = "datasource-entity-test.jar";
       final ArchivePath targetDsPath = ArchivePaths.create(FILENAME_EMBEDDED_DS);
       final ArchivePath targetPersistencePath = ArchivePaths.create(PATH_DESTINATION_PERSISTENCE_XML);
-      final JavaArchive archive = Archives.create(name, JavaArchive.class);
+      final JavaArchive archive = ShrinkWrap.create(name, JavaArchive.class);
       archive.addClasses(Jbossian.class, JbossianRegistrarLocalBusiness.class, JbossianRegistrarBean.class)
             .addResource(PATH_RESOURCE_DS_XML_EMBEDDED, targetDsPath).addManifestResource(
                   PATH_RESOURCE_PERSISTENCE_XML_EMBEDDED, targetPersistencePath);
@@ -461,7 +461,7 @@
       // Make a deployment
       final String appName = "webservice";
       final String name = appName + ".war";
-      final WebArchive archive = Archives.create(name, WebArchive.class);
+      final WebArchive archive = ShrinkWrap.create(name, WebArchive.class);
       final String targetPathWebXml = "web.xml";
       archive.addWebResource(PATH_ACTUAL_WEB_XML_WS, targetPathWebXml).addClass(
             org.jboss.jbossas.embedded.testsuite.ws.EmbeddedWs.class);

Modified: branches/KABIR_JAVASSIST_REFLECT/pom.xml
===================================================================
--- branches/KABIR_JAVASSIST_REFLECT/pom.xml	2010-04-23 10:53:47 UTC (rev 104190)
+++ branches/KABIR_JAVASSIST_REFLECT/pom.xml	2010-04-23 11:00:30 UTC (rev 104191)
@@ -484,28 +484,25 @@
     </dependencies>
   </dependencyManagement>
   
+  <!-- 
+    Define the repositories and plugin repositories to be used.
+    See http://community.jboss.org/wiki/MavenGettingStarted-Users
+  -->
+
   <!-- Repositories -->
   <repositories>
     <repository>
-      <id>repository.jboss.org</id>
-      <name>JBoss Releases Repository</name>
-      <url>http://repository.jboss.org/maven2</url>
+      <id>jboss-public-repository-group</id>
+      <name>JBoss Public Maven Repository Group</name>
+      <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+      <layout>default</layout>
       <releases>
         <enabled>true</enabled>
+	<updatePolicy>never</updatePolicy>
       </releases>
       <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>snapshots.jboss.org</id>
-      <name>JBoss Snapshots Repository</name>
-      <url>http://snapshots.jboss.org/maven2</url>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
         <enabled>true</enabled>
+	<updatePolicy>never</updatePolicy>
       </snapshots>
     </repository>
   </repositories>
@@ -513,26 +510,17 @@
   <!-- Plugin Repositories -->
   <pluginRepositories>
     <pluginRepository>
-      <id>repository.jboss.org</id>
-      <name>JBoss Plugin Releases</name>
-      <url>http://repository.jboss.org/maven2</url>
+      <id>jboss-public-repository-group</id>
+      <name>JBoss Public Maven Repository Group</name>
+      <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+      <layout>default</layout>
       <releases>
         <enabled>true</enabled>
+	<updatePolicy>never</updatePolicy>
       </releases>
       <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </pluginRepository>
-    <pluginRepository>
-      <id>snapshots.jboss.org</id>
-      <name>JBoss Plugin Snapshots</name>
-      <url>http://snapshots.jboss.org/maven2</url>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
         <enabled>true</enabled>
-        <updatePolicy>never</updatePolicy>
+	<updatePolicy>never</updatePolicy>
       </snapshots>
     </pluginRepository>
   </pluginRepositories>

Modified: branches/KABIR_JAVASSIST_REFLECT/server/src/etc/deployers/metadata-deployer-jboss-beans.xml
===================================================================
--- branches/KABIR_JAVASSIST_REFLECT/server/src/etc/deployers/metadata-deployer-jboss-beans.xml	2010-04-23 10:53:47 UTC (rev 104190)
+++ branches/KABIR_JAVASSIST_REFLECT/server/src/etc/deployers/metadata-deployer-jboss-beans.xml	2010-04-23 11:00:30 UTC (rev 104191)
@@ -188,6 +188,11 @@
                <key>application-client_5.xsd</key>
                <value>org.jboss.metadata.client.spec.ApplicationClient5MetaData</value>
             </entry>
+            <entry>
+               <key>application-client_6.xsd</key>
+               <value>org.jboss.metadata.client.spec.ApplicationClient6MetaData</value>
+            </entry>
+
             <!-- ApplicationClientMetaData -->
             <entry>
                <key>jboss-client</key>
@@ -217,6 +222,10 @@
                <key>jboss-client_5_0.xsd</key>
                <value>org.jboss.metadata.client.jboss.JBossClient5MetaData</value>
             </entry>
+            <entry>
+               <key>jboss-client_6_0.xsd</key>
+               <value>org.jboss.metadata.client.jboss.JBossClient6MetaData</value>
+            </entry>
             
             <!-- EjbJarMetaData -->
             <entry>

Modified: branches/KABIR_JAVASSIST_REFLECT/testsuite/src/main/org/jboss/test/osgi/simple/SimpleRuntimeTestCase.java
===================================================================
--- branches/KABIR_JAVASSIST_REFLECT/testsuite/src/main/org/jboss/test/osgi/simple/SimpleRuntimeTestCase.java	2010-04-23 10:53:47 UTC (rev 104190)
+++ branches/KABIR_JAVASSIST_REFLECT/testsuite/src/main/org/jboss/test/osgi/simple/SimpleRuntimeTestCase.java	2010-04-23 11:00:30 UTC (rev 104191)
@@ -29,7 +29,7 @@
 import org.jboss.osgi.testing.OSGiManifestBuilder;
 import org.jboss.osgi.testing.OSGiRuntime;
 import org.jboss.osgi.testing.OSGiRuntimeTest;
-import org.jboss.shrinkwrap.api.Archives;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.Asset;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.Test;
@@ -47,7 +47,7 @@
    public void testSimpleBundle() throws Exception
    {
       // Build the bundle with shrinkwrap
-      final JavaArchive archive = Archives.create("example-simple", JavaArchive.class);
+      final JavaArchive archive = ShrinkWrap.create("example-simple", JavaArchive.class);
       archive.setManifest(new Asset()
       {
          public InputStream openStream()
@@ -81,4 +81,4 @@
          runtime.shutdown();
       }
    }
-}
\ No newline at end of file
+}

Modified: branches/KABIR_JAVASSIST_REFLECT/tomcat/src/webapps/ROOT.war/WEB-INF/web.xml
===================================================================
--- branches/KABIR_JAVASSIST_REFLECT/tomcat/src/webapps/ROOT.war/WEB-INF/web.xml	2010-04-23 10:53:47 UTC (rev 104190)
+++ branches/KABIR_JAVASSIST_REFLECT/tomcat/src/webapps/ROOT.war/WEB-INF/web.xml	2010-04-23 11:00:30 UTC (rev 104191)
@@ -9,6 +9,7 @@
   <description>
      Welcome to JBoss
   </description>
+  <!-- Uncomment to enable the status Servlet
   <servlet>
     <servlet-name>Status Servlet</servlet-name>
     <servlet-class>org.jboss.web.tomcat.service.StatusServlet</servlet-class>
@@ -17,4 +18,5 @@
     <servlet-name>Status Servlet</servlet-name>
     <url-pattern>/status</url-pattern>
   </servlet-mapping>
+  -->
 </web-app>

Modified: branches/KABIR_JAVASSIST_REFLECT/tomcat/src/webapps/ROOT.war/index.html
===================================================================
--- branches/KABIR_JAVASSIST_REFLECT/tomcat/src/webapps/ROOT.war/index.html	2010-04-23 10:53:47 UTC (rev 104190)
+++ branches/KABIR_JAVASSIST_REFLECT/tomcat/src/webapps/ROOT.war/index.html	2010-04-23 11:00:30 UTC (rev 104191)
@@ -20,17 +20,14 @@
    <ul>
       <li><a href="/admin-console/">Administration Console</a></li>
       <li><a href="/jmx-console/">JMX Console</a></li>
-      <li><a href="/status">Tomcat status</a>
-          <a href="/status?full=true">(full)</a>
-          <a href="/status?XML=true">(XML)</a></li>
    </ul>
 
    <h3>JBoss AS Online Resources</h3>
    <ul>
       <li><a href="http://www.jboss.org/jbossas/docs">JBoss AS Documentation</a></li>
-      <li><a href="http://wiki.jboss.org">JBoss Wiki</a></li>
+      <li><a href="http://community.jboss.org/en/wiki">JBoss Wiki</a></li>
       <li><a href="http://jira.jboss.org/jira/browse/JBAS">JBoss AS JIRA</a></li>
-      <li><a href="http://www.jboss.org/index.html?module=bb">JBoss Forums</a></li>
+      <li><a href="http://community.jboss.org/en/jbossas">JBoss Forums</a></li>
        <li><a href="https://lists.jboss.org/">JBoss Mailing Lists</a></li>
    </ul>
 

Modified: branches/KABIR_JAVASSIST_REFLECT/varia/src/resources/jmx/jmx-console-web.xml
===================================================================
--- branches/KABIR_JAVASSIST_REFLECT/varia/src/resources/jmx/jmx-console-web.xml	2010-04-23 10:53:47 UTC (rev 104190)
+++ branches/KABIR_JAVASSIST_REFLECT/varia/src/resources/jmx/jmx-console-web.xml	2010-04-23 11:00:30 UTC (rev 104191)
@@ -104,8 +104,6 @@
          role JBossAdmin to access the HTML JMX console web application
        </description>
        <url-pattern>/*</url-pattern>
-       <http-method>GET</http-method>
-       <http-method>POST</http-method>
      </web-resource-collection>
      <auth-constraint>
        <role-name>JBossAdmin</role-name>

More information about the jboss-cvs-commits mailing list