You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2004/07/02 10:08:47 UTC
svn commit: rev 22458 - in avalon/trunk/planet/tutorials/main: . conf etc etc/test src/java src/main src/main/tutorial
Author: mcconnell
Date: Fri Jul 2 01:08:46 2004
New Revision: 22458
Added:
avalon/trunk/planet/tutorials/main/etc/
avalon/trunk/planet/tutorials/main/etc/test/
avalon/trunk/planet/tutorials/main/etc/test/merlin.properties
avalon/trunk/planet/tutorials/main/src/main/
- copied from rev 22276, avalon/trunk/planet/tutorials/main/src/java/
Removed:
avalon/trunk/planet/tutorials/main/conf/
avalon/trunk/planet/tutorials/main/copy-all.xsl
avalon/trunk/planet/tutorials/main/index.ent
avalon/trunk/planet/tutorials/main/maven.xml
avalon/trunk/planet/tutorials/main/merlin.properties
avalon/trunk/planet/tutorials/main/project.properties
avalon/trunk/planet/tutorials/main/project.xml
avalon/trunk/planet/tutorials/main/src/java/
Modified:
avalon/trunk/planet/tutorials/main/README.txt
avalon/trunk/planet/tutorials/main/src/main/tutorial/Main.java
Log:
add the main embedding tutorial
Modified: avalon/trunk/planet/tutorials/main/README.txt
==============================================================================
--- avalon/trunk/planet/tutorials/main/README.txt (original)
+++ avalon/trunk/planet/tutorials/main/README.txt Fri Jul 2 01:08:46 2004
@@ -13,19 +13,7 @@
Build
-----
-Build the project using the following command:
+Build and run the project using the following command:
-$ maven
-
-The above command triggers the default goal jar:jar which will
-create a jar file under the target directory named
-merlin-main-1.0.jar.
-
-Runtime
--------
-
-To run the main class execute the following command from the
-merlin/platform/tutorials/main directory:
-
-$ java -jar target/merlin-main-1.0.jar
+$ ant
Added: avalon/trunk/planet/tutorials/main/etc/test/merlin.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/planet/tutorials/main/etc/test/merlin.properties Fri Jul 2 01:08:46 2004
@@ -0,0 +1,5 @@
+
+merlin.info = false
+merlin.debug = false
+merlin.audit = true
+merlin.deployment = @HELLO-TUTORIAL-URI@
Modified: avalon/trunk/planet/tutorials/main/src/main/tutorial/Main.java
==============================================================================
--- avalon/trunk/planet/tutorials/main/src/java/tutorial/Main.java (original)
+++ avalon/trunk/planet/tutorials/main/src/main/tutorial/Main.java Fri Jul 2 01:08:46 2004
@@ -58,7 +58,7 @@
// order to execute.
//
- String spec = "artifact:merlin/merlin-impl#3.3-SNAPSHOT";
+ String spec = "@MERLIN-IMPL-SPEC@";
Artifact artifact = Artifact.createArtifact( spec );
Builder builder = context.newBuilder( artifact );
@@ -73,7 +73,15 @@
//
Factory factory = builder.getFactory();
- Map criteria = factory.createDefaultCriteria();
- factory.create( criteria );
+ Map criteria = factory.createDefaultCriteria();
+ criteria.put( "merlin.server", "false" );
+ try
+ {
+ Object kernel = factory.create( criteria );
+ }
+ catch( Throwable e )
+ {
+ e.printStackTrace();
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org