From 4faeab997b8b54a7a166e5429b57a33aca65992b Mon Sep 17 00:00:00 2001
From: Jonas Boner <jonas@jonasboner.com>
Date: Fri, 14 Aug 2009 10:40:19 +0200
Subject: [PATCH] added changes to changes.xml

---
 changes.xml       |  2 ++
 pom.xml           | 62 ++++-------------------------------------------
 util-java/pom.xml | 20 ++-------------
 3 files changed, 9 insertions(+), 75 deletions(-)
 mode change 100755 => 100644 changes.xml

diff --git a/changes.xml b/changes.xml
old mode 100755
new mode 100644
index c49d0071b7..80382698a0
--- a/changes.xml
+++ b/changes.xml
@@ -31,7 +31,9 @@ see http://maven.apache.org/plugins/maven-changes-plugin/usage.html for full gui
       <action dev="Jonas Bon&#233;r" type="add">Added CassandraSession API (with socket pooling) wrapping Cassandra's Thrift API in Scala and Java APIs</action>
       <action dev="Jonas Bon&#233;r" type="add">CassandraStorage is now works with external Cassandra cluster</action>
       <action dev="Jonas Bon&#233;r" type="remove">Removed embedded Cassandra mode</action>
+      <action dev="Jonas Bon&#233;r" type="remove">Removed startup scripts and lib dir</action>
       <action dev="Jonas Bon&#233;r" type="add">ActorRegistry for retrieving Actor instances</action>
+      <action dev="Jonas Bon&#233;r" type="add">Now start up kernel with 'java -jar dist/akka-0.6.jar'</action>
       <action dev="Jonas Bon&#233;r" type="fix">Concurrent mode is now per actor basis</action>
       <action dev="Jonas Bon&#233;r" type="fix">Made Akka Web App aware, does not require AKKA_HOME when using it as a library</action>
       <action dev="Jonas Bon&#233;r" type="fix">Fixed dispatcher bug</action>
diff --git a/pom.xml b/pom.xml
index 0a100b4187..49364b494a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -195,9 +195,9 @@
             <jvmArg>-Xmx1024m</jvmArg>
           </jvmArgs>
           <args>
-            <arg>-unchecked</arg>
+            <!--arg>-unchecked</arg>
             <arg>-deprecation</arg>
-            <arg>-Xno-varargs-conversion</arg>
+            <arg>-Xno-varargs-conversion</arg-->
           </args>
           <scalaVersion>${scala.version}</scalaVersion>
         </configuration>
@@ -226,7 +226,7 @@
         <configuration>
           <archive>
             <manifestEntries>
-              <lift_version>${pom.version}</lift_version>
+              <akka_version>${akka.version}</akka_version>
             </manifestEntries>
           </archive>
         </configuration>
@@ -234,35 +234,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>
-        <configuration>
-          <tasks>
-            <!-- To start an akka server, use: mvn antrun:run -->
-            <!--echo message="akka kernel starting..."/>
-
-<property name="compile_classpath" refid="maven.compile.classpath"/>
-<property name="runtime_classpath" refid="maven.runtime.classpath"/>
-<property name="test_classpath"    refid="maven.test.classpath"/>
-
-<java classname="com.scalablesolutions.akka.kernel.Kernel" fork="true">
-<classpath>
-<pathelement path="${runtime_classpath}"/>
-<pathelement path="${compile_classpath}"/>
-</classpath>
-<jvmarg value="-server"/>
-<jvmarg value="-Xms256M"/>
-<jvmarg value="-Xmx256M"/>
-<jvmarg value="-verbosegc"/>
-<for profiling/performance...
-<jvmarg value="-javaagent:tmp/shiftone-jrat.jar"/>
-<jvmarg value="-agentlib:hprof=heap=sites"/>
-<jvmarg value="-agentlib:hprof=cpu=samples"/>
-<jvmarg value="-agentlib:hprof=cpu=times,thread=y"/>
-<arg value="com.scalablesolutions.akka.kernel.Kernel"/>
-<arg value="."/>
-</java>
-<echo message="akka server is shutdown"/-->
-          </tasks>
-        </configuration>
       </plugin>
     </plugins>
     <pluginManagement>
@@ -327,7 +298,8 @@
             <jvmArg>-DpackageLinkDefs=file://${basedir}/../vscaladocs-packageLinkDefs.properties</jvmArg>
           </jvmArgs>
           <args>
-          <arg>-unchecked</arg></args>
+            <arg>-unchecked</arg>
+          </args>
           <vscaladocVersion>1.2-SNAPSHOT</vscaladocVersion>
           <scalaVersion>${scala.version}</scalaVersion>
         </configuration>
@@ -365,30 +337,6 @@
   <profiles>
     <profile>
       <id>release</id>
-      <!--
-          <build>
-          <plugins>
-          <plugin>
-          <artifactId>maven-assembly-plugin</artifactId>
-          <configuration>
-          <descriptorRefs>
-          <descriptorRef>project</descriptorRef>
-          </descriptorRefs>
-          <tarLongFileMode>gnu</tarLongFileMode>
-          </configuration>
-          <executions>
-          <execution>
-          <id>make-assembly</id>
-          <phase>package</phase>
-          <goals>
-          <goal>attached</goal>
-          </goals>
-          </execution>
-          </executions>
-          </plugin>
-          </plugins>
-          </build>
-      -->
       <distributionManagement>
         <repository>
           <id>scala-tools.org</id>
diff --git a/util-java/pom.xml b/util-java/pom.xml
index 77565af204..643a25f74f 100644
--- a/util-java/pom.xml
+++ b/util-java/pom.xml
@@ -11,13 +11,14 @@
     <artifactId>akka</artifactId>
     <groupId>se.scalablesolutions.akka</groupId>
     <version>0.5</version>
+    <relativePath>../pom.xml</relativePath>
   </parent>
 
   <dependencies>
     <dependency>
       <groupId>org.guiceyfruit</groupId>
       <artifactId>guice-core</artifactId>
-      <version>2.0-beta-4</version>
+      <version>2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.google.protobuf</groupId>
@@ -41,23 +42,6 @@
           </includes>
         </configuration>
       </plugin>
-      <plugin>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>install</phase>
-            <configuration>
-              <tasks>
-                <copy file="target/akka-util-java-${akka.version}.jar"
-                      tofile="../lib/akka-util-java-${akka.version}.jar"/>
-              </tasks>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 </project>