Moved component and receivers companion sources to the Chainsaw sourc…

…e tree - those companions won't be released.

git-svn-id: https://svn.apache.org/repos/asf/logging/chainsaw/trunk@1178304 13f79535-47bb-0310-9956-ffa450edef68

HOWTOBUILD.txt

@@ -23,19 +23,6 @@ Firstly, you'll need maven 2.0.9+ to build Chainsaw:
 http://maven.apache.org
 
 
-Next, an interim step is required until the 'companions' are voted on and released:
-
-* SVN check out the following projects:
-	log4j-component - http://svn.apache.org/repos/asf/logging/log4j/companions/component/trunk/
-	log4j-extras - http://svn.apache.org/repos/asf/logging/log4j/companions/extras/trunk/
-	log4j-receivers - http://svn.apache.org/repos/asf/logging/log4j/companions/receivers/trunk/
-
-  In each of these checkout directories:
-  	mvn install
-
-  This will install into your local maven repository the correct releases of the required dependencies. 
-  These dependencies are not yet available in the standard maven repositories, and so failure to complete this step will prevent you from building Chainsaw.
-
 * cd to Chainsaw project checkout directory
 
 	mvn install

pom.xml

@@ -118,8 +118,7 @@
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>1.2</source>
-          <target>1.1</target>
+          <source>1.4</source>
         </configuration>
       </plugin>
       <plugin>
@@ -220,7 +219,7 @@
             <artifactId>ant-contrib</artifactId>
             <version>1.0b2</version>
           </dependency>
-        </dependencies>
+	</dependencies>
       </plugin>
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
@@ -324,6 +323,14 @@
           <iconFile>${basedir}/src/main/resources/logo.icns</iconFile>
           <bundleName>Chainsaw</bundleName>
         </configuration>
+        <executions>
+            <execution>
+                <phase>package</phase>
+                <goals>
+                    <goal>bundle</goal>
+                </goals>
+            </execution>
+       </executions>
       </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
@@ -384,17 +391,6 @@
       <artifactId>apache-log4j-extras</artifactId>
       <version>1.1</version>
     </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>apache-log4j-receivers</artifactId>
-      <version>1.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>apache-log4j-receivers</artifactId>
-      <version>1.0-SNAPSHOT</version>
-      <classifier>javadoc</classifier>
-    </dependency>
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
@@ -437,6 +433,18 @@
       <artifactId>jsch</artifactId>
       <version>0.1.42</version>
     </dependency>
+    <dependency>
+		<groupId>hsqldb</groupId>
+		<artifactId>hsqldb</artifactId>
+		<version>1.8.0.7</version>
+		<scope>test</scope>
+	</dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-jms_1.1_spec</artifactId>
+        <version>1.0</version>
+        <optional>true</optional>
+    </dependency>
   </dependencies>
   <reporting>
     <excludeDefaults>true</excludeDefaults>
@@ -480,7 +488,7 @@
       </plugin>
     </plugins>
   </reporting>
-  <distributionManagement>
+    <distributionManagement>
     <repository>
       <id>logging.repo</id>
       <url>scp://people.apache.org/www/people.apache.org/builds/logging/repo/</url>