[jboss-svn-commits] JBL Code SVN: r11575 - in labs/jbossrules/trunk: documentation and 3 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Wed May 2 00:37:18 EDT 2007


Author: mark.proctor at jboss.com
Date: 2007-05-02 00:37:18 -0400 (Wed, 02 May 2007)
New Revision: 11575

Added:
   labs/jbossrules/trunk/LICENSE-ASL-2.0.txt
   labs/jbossrules/trunk/src/main/assembly/eclipse.xml
   labs/jbossrules/trunk/src/main/assembly/examples.xml
Modified:
   labs/jbossrules/trunk/documentation/pom.xml
   labs/jbossrules/trunk/drools-eclipse/pom.xml
   labs/jbossrules/trunk/drools-jsr94/pom.xml
   labs/jbossrules/trunk/pom.xml
   labs/jbossrules/trunk/src/main/assembly/bin.xml
   labs/jbossrules/trunk/src/main/assembly/brms.xml
   labs/jbossrules/trunk/src/main/assembly/src.xml
Log:
-getting assemblers to work

Added: labs/jbossrules/trunk/LICENSE-ASL-2.0.txt
===================================================================
--- labs/jbossrules/trunk/LICENSE-ASL-2.0.txt	                        (rev 0)
+++ labs/jbossrules/trunk/LICENSE-ASL-2.0.txt	2007-05-02 04:37:18 UTC (rev 11575)
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed 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.

Modified: labs/jbossrules/trunk/documentation/pom.xml
===================================================================
--- labs/jbossrules/trunk/documentation/pom.xml	2007-05-02 03:43:22 UTC (rev 11574)
+++ labs/jbossrules/trunk/documentation/pom.xml	2007-05-02 04:37:18 UTC (rev 11575)
@@ -9,7 +9,7 @@
   </parent>
 
   <artifactId>drools-documentation</artifactId>
-  <packaging>pom</packaging>
+  <packaging>jar</packaging>
   <name>Drools :: Documentation</name>
 
   <repositories>
@@ -29,21 +29,22 @@
               <id>manual</id>
               <phase>generate-resources</phase>
               <configuration>
-                <tasks>
+                <tasks>            
                     <delete dir="manual/build"/>
+                    <delete dir="src/main/resources"/>
+                    
                     <ant dir="manual" inheritRefs="true" />
-                    <delete dir="../drools-eclipse/drools-eclipse-plugin/help/eclipse"/>
-                    <delete dir="../drools-eclipse/drools-eclipse-plugin/help/shared"/>
+                    
                     <replace file="manual/build/en/eclipse/toc.xml" token="href=&quot;" value="href=&quot;help/eclipse/"/>
                     <replace file="manual/build/en/eclipse/toc.xml" token="topic=&quot;" value="topic=&quot;help/eclipse/"/>
-                    <copy todir="../drools-eclipse/drools-eclipse-plugin/help">
-                      <fileset dir="manual/build/en" includes="shared/** eclipse/**" excludes="**/*.svg **/*.db"/>
-                    </copy>
+                                        
+                    <copy todir="src/main/resources">
+                      <fileset dir="manual/build/en" includes="shared/** eclipse/** html/** html_single/**" excludes="**/*.svg **/*.db"/>
+                    </copy>                   
                     
-                    <!-- Leave this copy to the assembly for now -->
-                    <!--copy todir="../target/docs">
+                    <copy todir="../target/docs">
                       <fileset dir="manual/build/en" includes="shared/** html/** html_single/**" excludes="**/*.svg **/*.db"/>
-                    </copy-->
+                    </copy>
                 </tasks>
               </configuration>
               <goals>

Modified: labs/jbossrules/trunk/drools-eclipse/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/pom.xml	2007-05-02 03:43:22 UTC (rev 11574)
+++ labs/jbossrules/trunk/drools-eclipse/pom.xml	2007-05-02 04:37:18 UTC (rev 11575)
@@ -20,18 +20,40 @@
        <executions>
          <execution>
            <id>clean lib</id>
-           <phase>process-resources</phase>
+           <phase>clean</phase>
            <configuration>
              <tasks>                              
                 <delete>
-                  <fileset dir="drools-eclipse-plugin/lib" includes="**/*.jar" excludes="**/.svn" />
+                  <fileset dir="drools-eclipse-plugin/lib" includes="**/*.jar" excludes="**/.svn" />                 
                 </delete>
+                <delete dir="drools-eclipse-plugin/help/shared" />     
+                <delete dir="drools-eclipse-plugin/help/eclipse" />     
              </tasks>
            </configuration>
            <goals>
              <goal>run</goal>
            </goals>
-         </execution>       
+         </execution>    
+         
+         <execution>
+           <id>unzip manual</id>
+           <phase>process-resources</phase>
+           <configuration>
+             <tasks>     
+               <unzip src="drools-eclipse-plugin/lib/drools-documentation.jar" dest="drools-eclipse-plugin/help">
+                  <patternset>
+                      <include name="eclipse/**/**"/>
+                      <include name="shared/**/**"/>
+                  </patternset>               
+               </unzip>         
+               
+               <delete dir="drools-eclipse-plugin/lib/drools-documentation.jar" />     
+             </tasks>
+           </configuration>
+           <goals>
+             <goal>run</goal>
+           </goals>           
+         </execution>
        
          <execution>
            <id>compile-plugin</id>
@@ -162,7 +184,7 @@
         <executions>
           <execution>
             <id>copy-dependencies</id>
-            <phase>process-resources</phase>
+            <phase>generate-resources</phase>
             <goals>
               <goal>copy-dependencies</goal>
             </goals>
@@ -234,7 +256,7 @@
 
     <dependency>
       <groupId>org.drools</groupId>
-      <artifactId>drools-documentation</artifactId>
+      <artifactId>drools-documentation</artifactId>         
    </dependency>      
 </dependencies>
 

Modified: labs/jbossrules/trunk/drools-jsr94/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-jsr94/pom.xml	2007-05-02 03:43:22 UTC (rev 11574)
+++ labs/jbossrules/trunk/drools-jsr94/pom.xml	2007-05-02 04:37:18 UTC (rev 11575)
@@ -63,10 +63,12 @@
     <dependency>
       <groupId>jsr94</groupId>
       <artifactId>jsr94-tck</artifactId>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>jsr94</groupId>
       <artifactId>jsr94-sigtest</artifactId>
+      <scope>test</scope>
     </dependency>
   </dependencies>
 

Modified: labs/jbossrules/trunk/pom.xml
===================================================================
--- labs/jbossrules/trunk/pom.xml	2007-05-02 03:43:22 UTC (rev 11574)
+++ labs/jbossrules/trunk/pom.xml	2007-05-02 04:37:18 UTC (rev 11575)
@@ -350,7 +350,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.1</version>
+        <version>2.2-beta-1</version>
         <configuration>
           <descriptors>
             <descriptor>src/main/assembly/bin.xml</descriptor>

Modified: labs/jbossrules/trunk/src/main/assembly/bin.xml
===================================================================
--- labs/jbossrules/trunk/src/main/assembly/bin.xml	2007-05-02 03:43:22 UTC (rev 11574)
+++ labs/jbossrules/trunk/src/main/assembly/bin.xml	2007-05-02 04:37:18 UTC (rev 11575)
@@ -3,25 +3,83 @@
   <formats>
     <format>zip</format>
   </formats>
+  
+  <fileSets>
+  
+    <fileSet>
+      <includes>
+        <include>LICENSE*</include>
+      </includes>
+    </fileSet>
+    
+    <fileSet>
+       <directory>target/site/apidocs</directory>
+       <outputDirectory>documentation/apidocs</outputDirectory>
+    </fileSet>    
 
+    <fileSet>
+       <directory>target/docs</directory>
+       <outputDirectory>documentation/manual</outputDirectory>
+    </fileSet>    
+    
+    
+    <fileSet>
+      <directory>src</directory>
+    </fileSet>
+  </fileSets>  
+
   <moduleSets>
     <moduleSet>
     	<includes>
-		<!-- note: we do not include BRMS here, as it is distributed as a single war, and a war includes all already -->
-		<include>org.drools:drools-core</include>
-		<include>org.drools:drools-compiler</include>
-		<include>org.drools:drools-jsr94</include>
-		<include>org.drools:drools-decisiontables</include>
-		<!--include>org.drools:drools-clips</include-->
-		<include>org.drools:drools-examples</include>
-	</includes>
+    		<!-- note: we do not include BRMS here, as it is distributed as a single war, and a war includes all already -->
+    		<include>org.drools:drools-core</include>
+    		<include>org.drools:drools-compiler</include>
+    		<include>org.drools:drools-jsr94</include>
+    		<include>org.drools:drools-decisiontables</include>
+    		<!--include>org.drools:drools-clips</include-->
+    		<include>org.drools:drools-examples</include>
+    	</includes>
+    	
       <binaries>
-        <outputDirectory>modules</outputDirectory>
-        <includeDependencies>true</includeDependencies>
-        <unpack>false</unpack>
-      </binaries>   
-	
+        <outputDirectory></outputDirectory>
+        <unpack>false</unpack> 
+        
+    	  <dependencySets>	
+    	    <dependencySet>
+    	      <outputDirectory>lib</outputDirectory>
+    	      <unpack>false</unpack>
+    	      <excludes> 
+    	         <exclude>org.drools:drools-*</exclude>
+    	      </excludes>
+    	    </dependencySet>  	         
+    	  </dependencySets>  	
+      </binaries>   
+	    
     </moduleSet>
+    
+    <!--moduleSet>
+    	<includes>
+    		<include>org.drools:drools-documentation</include>
+    	</includes>
+    	
+      <binaries>
+        <outputDirectory>documentation</outputDirectory>
+        <outputFileNameMapping>manual</outputFileNameMapping>
+	      <unpack>true</unpack> 
+	      <unpackOptions>
+	          <includes>
+	            <include>shared/**</include>
+	            <include>html/**</include>
+	            <include>manual/html_single/**</include>
+	          </includes>    	              	      
+	          <excludes>
+	            <exclude>eclipse/**</exclude>
+	            <exclude>META-INF/**</exclude>
+	          </excludes>
+	      </unpackOptions>  	          
+      </binaries>   
+	    
+    </moduleSet-->    
   </moduleSets>  
 
 

Modified: labs/jbossrules/trunk/src/main/assembly/brms.xml
===================================================================
--- labs/jbossrules/trunk/src/main/assembly/brms.xml	2007-05-02 03:43:22 UTC (rev 11574)
+++ labs/jbossrules/trunk/src/main/assembly/brms.xml	2007-05-02 04:37:18 UTC (rev 11575)
@@ -5,11 +5,12 @@
     <format>zip</format>
   </formats>
   
+  <includeBaseDirectory>false</includeBaseDirectory>
+  
   <!-- We include the BRMS specifically, as its a single atomic war -->
   <files>
 	<file>
-		<source>drools-jbrms/target/drools-*.war</source>
-		<outputDirectory>brms</outputDirectory>
+		<source>drools-jbrms/target/drools-jbrms.war</source>
 	</file>
   </files>
    

Added: labs/jbossrules/trunk/src/main/assembly/eclipse.xml
===================================================================
--- labs/jbossrules/trunk/src/main/assembly/eclipse.xml	                        (rev 0)
+++ labs/jbossrules/trunk/src/main/assembly/eclipse.xml	2007-05-02 04:37:18 UTC (rev 11575)
@@ -0,0 +1,16 @@
+
+<assembly>
+  <id>eclipse</id>
+  <formats>
+    <format>zip</format>
+  </formats>
+  
+  <!-- We include the BRMS specifically, as its a single atomic war -->
+  <files>
+	<file>
+		<source>drools-eclipse/target/*.war</source>
+		<outputDirectory>brms</outputDirectory>
+	</file>
+  </files>
+   
+</assembly>

Added: labs/jbossrules/trunk/src/main/assembly/examples.xml
===================================================================
--- labs/jbossrules/trunk/src/main/assembly/examples.xml	                        (rev 0)
+++ labs/jbossrules/trunk/src/main/assembly/examples.xml	2007-05-02 04:37:18 UTC (rev 11575)
@@ -0,0 +1,23 @@
+<assembly>
+  <id>examples</id>
+  <formats>
+    <format>zip</format>
+  </formats>
+  
+  <includeBaseDirectory>false</includeBaseDirectory>
+  
+  <fileSets>
+    <fileSet>
+      <directory>drools-examples</directory>
+      <outputDirectory>drools-examples</outputDirectory>
+      <includes>
+         <include>**/**</include>
+      </includes>
+      <excludes>
+        <exclude>**/target/**</exclude>
+        <exclude>**/.svn/**</exclude>
+        <exclude>**/.metadata/**</exclude>
+      </excludes>
+    </fileSet>
+  </fileSets>
+</assembly>

Modified: labs/jbossrules/trunk/src/main/assembly/src.xml
===================================================================
--- labs/jbossrules/trunk/src/main/assembly/src.xml	2007-05-02 03:43:22 UTC (rev 11574)
+++ labs/jbossrules/trunk/src/main/assembly/src.xml	2007-05-02 04:37:18 UTC (rev 11575)
@@ -16,11 +16,14 @@
          <include>drools-repository/**</include>
          <include>drools-jbrms/**</include>
          <include>documentation/**</include>
-         <include>repository/**</include>
+         <include>m2_repo/**</include>
          <include>*.xml</include>
          <include>*.txt</include>
       </includes>
       <excludes>
+        <exclude>documentation/src/**</exclude>
+        <exclude>drools-jbrms/repository/**</exclude>
+        <exclude>**/*.log/**</exclude>
         <exclude>**/target/**</exclude>
         <exclude>**/.svn/**</exclude>
         <exclude>**/.metadata/**</exclude>




More information about the jboss-svn-commits mailing list