[Carbon-dev] svn commit r14887 - in trunk/carbon/distribution: . assembly

[svn at wso2.org]

Author: saminda
Date: Mon Mar 17 00:29:20 2008
New Revision: 14887

Log:

cleaning up


Modified:
   trunk/carbon/distribution/assembly/bin.xml
   trunk/carbon/distribution/pom.xml

Modified: trunk/carbon/distribution/assembly/bin.xml
==============================================================================
--- trunk/carbon/distribution/assembly/bin.xml	(original)
+++ trunk/carbon/distribution/assembly/bin.xml	Mon Mar 17 00:29:20 2008
@@ -29,4 +29,10 @@
             <outputDirectory>wso2carbon-${wso2carbon.version}</outputDirectory>
         </fileSet>
     </fileSets>
+    <files>
+        <file>
+            <source>target/tmp/carbon-home/conf/wso2carbon.jks</source>
+            <outputDirectory>wso2carbon-${wso2carbon.version}/conf</outputDirectory>
+        </file>
+    </files>
 </assembly>
\ No newline at end of file

Modified: trunk/carbon/distribution/pom.xml
==============================================================================
--- trunk/carbon/distribution/pom.xml	(original)
+++ trunk/carbon/distribution/pom.xml	Mon Mar 17 00:29:20 2008
@@ -40,30 +40,19 @@
                 <version>1.0</version>
                 <executions>
                     <execution>
-                        <id>distribution-keytool-clean</id>
-                        <phase>clean</phase>
-                        <goals>
-                            <goal>clean</goal>
-                        </goals>
-                        <configuration>
-                            <keystore>carbon-home/conf/wso2carbon.jks</keystore>
-                        </configuration>
-                    </execution>
-                    <execution>
                         <id>distribution-keytool</id>
                         <phase>package</phase>
                         <goals>
                             <goal>genkey</goal>
                         </goals>
-                        <configuration>
-                            <keystore>carbon-home/conf/wso2carbon.jks</keystore>
-                            <dname>cn=wso2carbon, ou=None, L=Seattle, ST=Washington, o=WSO2,c=LK
-                            </dname>
-                            <keypass>wso2carbon</keypass>
-                            <storepass>wso2carbon</storepass>
-                        </configuration>
                     </execution>
                 </executions>
+                <configuration>
+                    <keystore>target/tmp/carbon-home/conf/wso2carbon.jks</keystore>
+                    <dname>cn=wso2carbon, ou=None, L=Seattle, ST=Washington, o=WSO2,c=LK</dname>
+                    <keypass>wso2carbon</keypass>
+                    <storepass>wso2carbon</storepass>
+                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>