Permalink
Browse files

Merge pull request #21 from jonnyzzz/jars

split kara jars to modules folders, fix start scripts
  • Loading branch information...
2 parents ef1996d + 0943024 commit 37a3cdc2fb595417b0a0211987b1697f242704d1 @shafirov shafirov committed Mar 13, 2013
Showing with 31 additions and 21 deletions.
  1. +1 −3 .idea/ant.xml
  2. +9 −13 .idea/artifacts/kara_dist.xml
  3. +18 −0 .idea/artifacts/kara_libs.xml
  4. +1 −1 bin/kara
  5. +1 −1 bin/kara.bat
  6. +1 −3 samples/KaraDemo/KaraDemo.iml
View
@@ -1,9 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="AntConfiguration">
- <buildFile url="file://$PROJECT_DIR$/build/build-artifacts.xml">
- <antReference name="Apache Ant version 1.8.2" />
- </buildFile>
+ <buildFile url="file://$PROJECT_DIR$/build/build-artifacts.xml" />
<buildFile url="file://$PROJECT_DIR$/build/build.xml" />
</component>
</project>
@@ -12,26 +12,22 @@
<element id="file-copy" path="$PROJECT_DIR$/bin/kara" />
<element id="file-copy" path="$PROJECT_DIR$/README.md" />
<element id="directory" name="lib">
- <element id="library" level="project" name="javax.servlet-3.0.0.v201112011016" />
- <element id="library" level="project" name="jackson-core-asl-1.9.9" />
- <element id="library" level="project" name="jetty-all-server-8.1.5.v20120716" />
- <element id="library" level="project" name="javassist-3.12.1.GA" />
- <element id="library" level="project" name="jackson-mapper-asl-1.9.9" />
- <element id="library" level="project" name="guava-11.0.2" />
- <element id="library" level="project" name="slf4j-log4j12-1.6.6" />
- <element id="library" level="project" name="slf4j-api-1.6.6" />
- <element id="library" level="project" name="reflections-0.9.8" />
- <element id="library" level="project" name="log4j-1.2.17" />
- <element id="library" level="project" name="KotlinRuntime" />
- <element id="artifact" artifact-name="kara-core" />
- <element id="artifact" artifact-name="kara-exec" />
+ <element id="artifact" artifact-name="kara-libs" />
</element>
<element id="directory" name="samples">
<element id="dir-copy" path="$PROJECT_DIR$/samples/KaraDemo" />
</element>
<element id="directory" name="licenses">
<element id="dir-copy" path="$PROJECT_DIR$/license" />
</element>
+ <element id="directory" name="modules">
+ <element id="directory" name="core">
+ <element id="artifact" artifact-name="kara-core" />
+ </element>
+ <element id="directory" name="exec">
+ <element id="artifact" artifact-name="kara-exec" />
+ </element>
+ </element>
</root>
</artifact>
</component>
@@ -0,0 +1,18 @@
+<component name="ArtifactManager">
+ <artifact name="kara-libs">
+ <output-path>$PROJECT_DIR$/out/artifacts/kara_libs</output-path>
+ <root id="root">
+ <element id="library" level="project" name="javax.servlet-3.0.0.v201112011016" />
+ <element id="library" level="project" name="jackson-core-asl-1.9.9" />
+ <element id="library" level="project" name="jetty-all-server-8.1.5.v20120716" />
+ <element id="library" level="project" name="javassist-3.12.1.GA" />
+ <element id="library" level="project" name="jackson-mapper-asl-1.9.9" />
+ <element id="library" level="project" name="guava-11.0.2" />
+ <element id="library" level="project" name="slf4j-log4j12-1.6.6" />
+ <element id="library" level="project" name="slf4j-api-1.6.6" />
+ <element id="library" level="project" name="reflections-0.9.8" />
+ <element id="library" level="project" name="log4j-1.2.17" />
+ <element id="library" level="project" name="KotlinRuntime" />
+ </root>
+ </artifact>
+</component>
View
@@ -7,7 +7,7 @@ export KARA_HOME="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
# get the jars needed for the classpath
JARS="$KARA_HOME/lib/*.jar"
-CP_JARS=
+CP_JARS="$KARA_HOME/modules/core/kara-core.jar:$KARA_HOME/modules/exec/kara-exec.jar"
for JAR in $JARS
do
case $JAR in
View
@@ -9,6 +9,6 @@ for %%j in (%jars%) do (
set cp_jars=%%j;!cp_jars!
)
-set cp_jars=!cp_jars!
+set cp_jars=!cp_jars!;%kara_home%\modules\core\kara-core.jar;%kara_home%\modules\exec\kara-exec.jar
java -DKARA_HOME=%kara_home% -classpath %cp_jars% kara.KaraPackage %*
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" inherit-compiler-output="false">
- <output url="file://$MODULE_DIR$/bin" />
- <output-test url="file://$KARA_HOME$/out/test/KaraDemo" />
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />

0 comments on commit 37a3cdc

Please sign in to comment.