[jboss-cvs] JBossAS SVN: r57983 - in trunk/messaging: . src src/etc src/main

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Wed Nov 1 20:27:55 EST 2006


Author: scott.stark at jboss.org
Date: 2006-11-01 20:27:52 -0500 (Wed, 01 Nov 2006)
New Revision: 57983

Added:
   trunk/messaging/src/etc/deploy/
   trunk/messaging/src/etc/examples/
Removed:
   trunk/messaging/.cvsignore
   trunk/messaging/component-info.xml
   trunk/messaging/jbossbuild.xml
   trunk/messaging/src/etc/default.mf
   trunk/messaging/src/etc/server/
   trunk/messaging/src/main/org/
   trunk/messaging/src/resources/
Modified:
   trunk/messaging/build.xml
Log:
Skeleton for the messagining integration code


Deleted: trunk/messaging/.cvsignore
===================================================================
--- trunk/messaging/.cvsignore	2006-11-02 01:12:37 UTC (rev 57982)
+++ trunk/messaging/.cvsignore	2006-11-02 01:27:52 UTC (rev 57983)
@@ -1,2 +0,0 @@
-output
-build.log

Modified: trunk/messaging/build.xml
===================================================================
--- trunk/messaging/build.xml	2006-11-02 01:12:37 UTC (rev 57982)
+++ trunk/messaging/build.xml	2006-11-02 01:27:52 UTC (rev 57983)
@@ -17,7 +17,7 @@
 
 <!-- $Id$ -->
 
-<project default="main" name="JBoss/Messaging">
+<project default="main" name="JBoss/Messaging Integration">
 
   <!-- ================================================================== -->
   <!-- Setup                                                              -->
@@ -56,8 +56,7 @@
 
     <!-- Module name(s) & version -->
     <property name="module.name" value="messaging"/>
-    <property name="module.Name" value="JBoss Messaging"/>
-    <property name="module.version" value="DEV"/>
+    <property name="module.Name" value="JBoss Messaging Integration"/>
 
     <!-- ========= -->
     <!-- Libraries -->
@@ -66,7 +65,6 @@
     <!-- The combined library classpath -->
     <path id="library.classpath">
       <path refid="apache.log4j.classpath"/>
-      <path refid="apache.commons.classpath"/>
       <path refid="oswego.concurrent.classpath"/>
       <path refid="junit.junit.classpath"/>
     </path>
@@ -82,38 +80,17 @@
       <path refid="jboss.common.logging.spi.classpath"/>
       <path refid="jboss.common.logging.log4j.classpath"/>
       <path refid="jboss.common.logging.jdk.classpath"/>
-      <path refid="jboss.system.classpath"/>
-      <path refid="jboss.systemjmx.classpath"/>
-      <path refid="jboss.naming.classpath"/>
-      <path refid="jboss.server.classpath"/>
-      <path refid="jboss.j2se.classpath"/>
-      <path refid="jboss.security.classpath"/>
-      <path refid="jboss.transaction.classpath"/>
     </path>
 
     <!-- ===== -->
     <!-- Tasks -->
     <!-- ===== -->
 
-    <property name="jar.prefix" value="jbossmq"/>
-    <property name="jar.client.includes" 
-              value="org/jboss/mq/*.class,
-                     org/jboss/mq/referenceable/**,
-	                 org/jboss/mq/il/**,
-	                 org/jboss/mq/cluster/**,
-                    org/jboss/mq/threadpool/**,
-	                 org/jboss/mq/xml/**,
-	                 org/jboss/mq/selectors/**"
-	/>
+    <property name="jar.prefix" value="jboss-messaging"/>
 
     <call target="_default:task-init"/>
   </target>
 
-  <patternset id="compile-rmi.pattern">
-      <include name="org/jboss/mq/il/rmi/RMIServerIL.class"/>
-      <include name="org/jboss/mq/il/rmi/RMIClientIL.class"/>
-  </patternset>
-
   <!-- ================================================================== -->
   <!-- Compile                                                            -->
   <!-- ================================================================== -->
@@ -126,59 +103,9 @@
      |  documentation compiles.
     -->
   <target name="compile" 
-	  depends="compile-parsers, _default:compile-classes, _default:compile-rmi, _default:compile-resources, _default:compile-etc"
+	  depends="_default:compile-classes, _default:compile-etc"
 	  description="Compile all source files."/>
 
-  <!-- Compile parsers -->
-  <target name="compile-parsers" depends="init">
-    <mkdir dir="${build.parsers}/org/jboss/mq/selectors"/>
-
-    <!-- message selector parser -->
-    <javacc target="${source.java}/org/jboss/mq/selectors/SelectorParser.jj" 
-            outputdirectory="${build.parsers}/org/jboss/mq/selectors"
-            javacchome="${sun.javacc.lib}"
-            static="false"/>
-
-    <!-- compile them now -->
-    <mkdir dir="${build.classes}"/>
-    <javac destdir="${build.classes}"
-           optimize="${javac.optimize}"
-           target="${javac.target}"
-           source="${javac.source}"
-           debug="${javac.debug}"
-           depend="${javac.depend}"
-           verbose="${javac.verbose}"
-           deprecation="${javac.deprecation}"
-           includeAntRuntime="${javac.include.ant.runtime}"
-           includeJavaRuntime="${javac.include.java.runtime}"
-           failonerror="${javac.fail.onerror}">
-       <classpath refid="javac.classpath"/>
-
-       <!-- 
-          | Ant really pissses me off!  Why can't I create a fileset
-          | and list the includes/excludes there?  Why the *uck do I have
-          | to use this src crap...
-        -->
-     
-       <!-- JavaCC creates output in a flat namespace -->
-       <src path="${build.parsers}"/>
-       <!--
-       <include name="*.java"/>
-	-->
-       <!-- Only want to build required the bits under selectors.* here -->
-       <src path="${source.java}"/>
-       <include name="org/jboss/mq/selectors/ASCII_CharStream.java"/>
-       <include name="org/jboss/mq/selectors/ParserException.java"/>
-       <include name="org/jboss/mq/selectors/SelectorParser.java"/>
-       <include name="org/jboss/mq/selectors/SelectorParserConstants.java"/>
-       <include name="org/jboss/mq/selectors/SelectorParserTokenManager.java"/>
-       <include name="org/jboss/mq/selectors/Token.java"/>
-       <include name="org/jboss/mq/selectors/TokenMgrError.java"/>
-       <include name="org/jboss/mq/selectors/Operator.java"/>
-       <include name="org/jboss/mq/selectors/Identifier.java"/>
-    </javac>
-  </target>
-
   <!-- ================================================================== -->
   <!-- Archives                                                           -->
   <!-- ================================================================== -->
@@ -190,6 +117,9 @@
 
     <!-- Server and client jars -->
     <call target="_default:server-client-jars"/>
+    <call target="sar" />
+  </target>
 
+  <target name="sar">
   </target>
 </project>

Deleted: trunk/messaging/component-info.xml
===================================================================
--- trunk/messaging/component-info.xml	2006-11-02 01:12:37 UTC (rev 57982)
+++ trunk/messaging/component-info.xml	2006-11-02 01:27:52 UTC (rev 57983)
@@ -1,30 +0,0 @@
-<project name="messaging-component-info">
-   <!-- ============================================================ -->
-   <!-- Messaging                                                    -->
-   <!-- ============================================================ -->
-
-   <component id="messaging"
-              module="jbossmq"
-              version="5.0-SNAPSHOT"
-   >
-      <artifact id="jbossmq.jar" release="server/all/lib"/>
-      <artifact id="jbossmq-client.jar" release="client"/>
-
-      <artifact id="hsqldb-jdbc-state-service.xml" 
-                outputpath="etc/server/default/deploy"/>
-      <artifact id="hsqldb-jdbc2-state-service.xml" 
-                outputpath="etc/server/default/deploy"/>
-      <artifact id="jbossmq-destinations-service.xml" 
-                outputpath="etc/server/default/deploy"/>
-      <artifact id="jbossmq-service.xml" 
-                outputpath="etc/server/default/deploy"/>
-      <artifact id="jvm-il-service.xml" 
-                outputpath="etc/server/default/deploy"/>
-      <artifact id="uil2-service.xml" 
-                outputpath="etc/server/default/deploy"/>
-      <export>
-         <include input="jbossmq.jar"/>
-      </export>
-   </component>
-
-</project>

Deleted: trunk/messaging/jbossbuild.xml
===================================================================
--- trunk/messaging/jbossbuild.xml	2006-11-02 01:12:37 UTC (rev 57982)
+++ trunk/messaging/jbossbuild.xml	2006-11-02 01:27:52 UTC (rev 57983)
@@ -1,91 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
- JBoss, the OpenSource J2EE webOS
- 
- Distributable under LGPL license.
- See terms of license at gnu.org.
--->
-
-<!-- ================================================================== -->
-<!-- Messaging component definition                                     -->
-<!-- ================================================================== -->
-
-<project name="project" 
-         default="build" 
-         basedir="."
->
-   <import file="../tools/etc/jbossbuild/tasks.xml"/>
-   <import file="component-info.xml"/>
-
-   <!-- =============================================================== -->
-   <!-- The component definition                                        -->
-   <!-- =============================================================== -->
-
-   <componentdef component="messaging" description="JBoss Messaging">
-
-      <!-- ============================================================ -->
-      <!-- The main source                                              -->
-      <!-- ============================================================ -->
-
-
-      <generatedsource id="selector-parser"
-                       srcdir="main"
-                       javacc="org/jboss/mq/selectors/SelectorParser.jj"
-                       static="false"/>
-
-      <source id="main"
-              rmic="org/jboss/mq/il/rmi/RMIServerIL.class,
-                    org/jboss/mq/il/rmi/RMIClientIL.class"
-              external="false"
-              iiop="false"
-              stubversion="1.2"
-
-      >
-
-         <include input="selector-parser"/>
-
-         <include component="apache-xalan"/>
-         <include component="apache-log4j"/>
-         <include component="oswego-concurrent"/>
-         <include component="junit"/>
-         <include component="gnu-regexp"/>
-
-         <include component="j2ee"/>
-         <include component="common"/>
-         <include component="system"/>
-         <include component="naming"/>
-         <include component="server"/>
-         <include component="j2se"/>
-         <include component="security"/>
-         <include component="transaction"/>
-      </source>
-
-      <!-- ============================================================ -->
-      <!-- jbossmq.jar                                                  -->
-      <!-- ============================================================ -->
-      <artifactdef artifact="jbossmq.jar">
-         <include input="main"/>
-      </artifactdef>
-
-      <!-- ============================================================ -->
-      <!-- jbossmq-client.jar                                           -->
-      <!-- ============================================================ -->
-
-      <artifactdef artifact="jbossmq-client.jar">
-         <include input="main">
-            <include pattern="org/jboss/mq/*.class"/>
-            <include pattern="org/jboss/mq/referenceable/**"/>
-            <include pattern="org/jboss/mq/il/**"/>
-            <include pattern="org/jboss/mq/cluster/**"/>
-            <include pattern="org/jboss/mq/xml/**"/>
-            <include pattern="org/jboss/mq/selectors/**"/>
-         </include>
-      </artifactdef>
-
-   </componentdef>
-
-   <!-- Generate the targets -->   
-   <generate generate="messaging"/>
-
-</project>

Deleted: trunk/messaging/src/etc/default.mf
===================================================================
--- trunk/messaging/src/etc/default.mf	2006-11-02 01:12:37 UTC (rev 57982)
+++ trunk/messaging/src/etc/default.mf	2006-11-02 01:27:52 UTC (rev 57983)
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0
-Created-By: @java.vm.version@ (@java.vm.vendor@)
-Specification-Title: @specification.title@
-Specification-Version: @specification.version@
-Specification-Vendor: @specification.vendor@
-Implementation-Title: @implementation.title@
-Implementation-URL: @implementation.url@
-Implementation-Version: @implementation.version@
-Implementation-Vendor: @implementation.vendor@
-Implementation-Vendor-Id: @implementation.vendor.id@




More information about the jboss-cvs-commits mailing list