incubator-connectors-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r961043 - in /incubator/lcf/trunk/modules: build.xml framework/build.xml framework/jetty-example/lcf.sh framework/jetty-runner/org/apache/lcf/jettyrunner/LCFJettyRunner.java
Date Tue, 06 Jul 2010 23:56:11 GMT
Author: kwright
Date: Tue Jul  6 23:56:11 2010
New Revision: 961043

URL: http://svn.apache.org/viewvc?rev=961043&view=rev
Log:
Replace example lcf.sh script with an equivalent start.jar, so example is started 'just like
solr'.

Removed:
    incubator/lcf/trunk/modules/framework/jetty-example/lcf.sh
Modified:
    incubator/lcf/trunk/modules/build.xml
    incubator/lcf/trunk/modules/framework/build.xml
    incubator/lcf/trunk/modules/framework/jetty-runner/org/apache/lcf/jettyrunner/LCFJettyRunner.java

Modified: incubator/lcf/trunk/modules/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/build.xml?rev=961043&r1=961042&r2=961043&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/build.xml (original)
+++ incubator/lcf/trunk/modules/build.xml Tue Jul  6 23:56:11 2010
@@ -640,6 +640,14 @@
     </target>
 
     <target name="deliver-example" depends="deliver-framework-example,deliver-activedirectory-example,deliver-documentum-example,deliver-filesystem-example,deliver-filenet-example,deliver-gts-example,deliver-jcifs-example,deliver-jdbc-example,deliver-livelink-example,deliver-memex-example,deliver-meridio-example,deliver-nulloutput-example,deliver-rss-example,deliver-sharepoint-example,deliver-solr-example,deliver-webcrawler-example">
+        <!-- Build a manifest file.  There doesn't seem to be any good way to do this
automatically in ant without developing my own
+        custom task, so I've hard coded all the class path libs. -->
+        <mkdir dir="build/example"/>
+        <manifest file="build/example/manifest">
+            <attribute name="Main-Class" value="org.apache.lcf.jettyrunner.LCFJettyRunner"/>
+            <attribute name="Class-Path" value="lib/commons-codec.jar lib/commons-collections.jar
lib/commons-el.jar lib/commons-fileupload.jar lib/commons-httpclient-lcf.jar lib/commons-io.jar
lib/commons-logging.jar lib/derbyclient.jar lib/derby.jar lib/derbyLocale_cs.jar lib/derbyLocale_de_DE.jar
lib/derbyLocale_es.jar lib/derbyLocale_fr.jar lib/derbyLocale_hu.jar lib/derbyLocale_it.jar
lib/derbyLocale_ja_JP.jar lib/derbyLocale_ko_KR.jar lib/derbyLocale_pl.jar lib/derbyLocale_pt_BR.jar
lib/derbyLocale_ru.jar lib/derbyLocale_zh_CN.jar lib/derbyLocale_zh_TW.jar lib/derbynet.jar
lib/derbyrun.jar lib/derbytools.jar lib/eclipse-ecj.jar lib/jasper-6.0.24.jar lib/jasper-el-6.0.24.jar
lib/jdbcpool-0.99.jar lib/jetty-6.1.22.jar lib/jetty-util-6.1.22.jar lib/jsp-api-2.1-glassfish-9.1.1.B60.25.p2.jar
lib/lcf-agents.jar lib/lcf-core.jar lib/lcf-jetty-runner.jar lib/lcf-pull-agent.jar lib/lcf-ui-core.jar
lib/log4j-1.2.jar lib/postgresql.jar lib/serializer.jar lib/servlet-api-2.5-20081
 211.jar lib/tomcat-juli-6.0.24.jar lib/xalan2.jar lib/xercesImpl-lcf.jar lib/xml-apis.jar"/>
+        </manifest>
+        <jar destfile="dist/example/start.jar" manifest="build/example/manifest"/>
     </target>
     
     <target name="calculate-tests-condition" depends="calculate-filesystem-condition,calculate-nulloutput-condition">

Modified: incubator/lcf/trunk/modules/framework/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/build.xml?rev=961043&r1=961042&r2=961043&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/build.xml (original)
+++ incubator/lcf/trunk/modules/framework/build.xml Tue Jul  6 23:56:11 2010
@@ -338,8 +338,6 @@
                 <include name="properties.xml"/>
                 <include name="connectors.xml"/>
                 <include name="logging.ini"/>
-                <include name="executecommand.sh"/>
-                <include name="lcf.sh"/>
             </fileset>
         </copy>
     </target>

Modified: incubator/lcf/trunk/modules/framework/jetty-runner/org/apache/lcf/jettyrunner/LCFJettyRunner.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/jetty-runner/org/apache/lcf/jettyrunner/LCFJettyRunner.java?rev=961043&r1=961042&r2=961043&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/jetty-runner/org/apache/lcf/jettyrunner/LCFJettyRunner.java
(original)
+++ incubator/lcf/trunk/modules/framework/jetty-runner/org/apache/lcf/jettyrunner/LCFJettyRunner.java
Tue Jul  6 23:56:11 2010
@@ -167,7 +167,7 @@ public class LCFJettyRunner
     }
     
     // Ready to begin in earnest...
-        
+    System.setProperty(LCF.lcfConfigFileProperty,"./properties.xml");
     try
     {
       LCF.initializeEnvironment();
@@ -433,7 +433,8 @@ public class LCFJettyRunner
     }
     catch (LCFException e)
     {
-      Logging.root.error("Exception: "+e.getMessage(),e);
+      if (Logging.root != null)
+        Logging.root.error("Exception: "+e.getMessage(),e);
       e.printStackTrace(System.err);
       System.exit(1);
     }



Mime
View raw message