Skip to content
Browse files

trying to get eclipse working with new jars now

  • Loading branch information...
1 parent a0bc8ab commit 36d684ced05fdde8ed56293ef1832f08c6d371bf @nrelbuilder nrelbuilder committed Oct 11, 2012
View
123 .classpath
@@ -3,65 +3,68 @@
<classpathentry kind="src" path="input/javasrc"/>
<classpathentry kind="src" path="output/src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="input/libinclude/javassist.jar"/>
- <classpathentry kind="lib" path="input/libinclude/guice-3.0.jar"/>
- <classpathentry kind="lib" path="input/libinclude/javax.inject.jar"/>
- <classpathentry kind="lib" path="input/libinclude/slf4j-api-1.6.4-sources.jar"/>
- <classpathentry kind="lib" path="input/libinclude/slf4j-api-1.6.4.jar"/>
- <classpathentry kind="lib" path="input/libinclude/slf4j-ext-1.6.4-sources.jar"/>
- <classpathentry kind="lib" path="input/libinclude/slf4j-ext-1.6.4.jar"/>
- <classpathentry kind="lib" path="input/libinclude/jcl-over-slf4j-1.6.4-sources.jar"/>
- <classpathentry kind="lib" path="input/libinclude/jcl-over-slf4j-1.6.4.jar"/>
- <classpathentry kind="lib" path="input/libinclude/jul-to-slf4j-1.6.4-sources.jar"/>
- <classpathentry kind="lib" path="input/libinclude/jul-to-slf4j-1.6.4.jar"/>
- <classpathentry kind="lib" path="input/libinclude/log4j-over-slf4j-1.6.4-sources.jar"/>
- <classpathentry kind="lib" path="input/libinclude/log4j-over-slf4j-1.6.4.jar"/>
- <classpathentry kind="lib" path="input/libinclude/logback-access-1.0.1-sources.jar"/>
- <classpathentry kind="lib" path="input/libinclude/logback-access-1.0.1.jar"/>
- <classpathentry kind="lib" path="input/libinclude/logback-classic-1.0.1-sources.jar"/>
- <classpathentry kind="lib" path="input/libinclude/logback-classic-1.0.1.jar"/>
- <classpathentry kind="lib" path="input/libinclude/logback-core-1.0.1-sources.jar"/>
- <classpathentry kind="lib" path="input/libinclude/logback-core-1.0.1.jar"/>
- <classpathentry kind="lib" path="input/libinclude/junit-4.10.jar"/>
- <classpathentry kind="lib" path="input/libinclude/antlr-3.4-complete-no-antlrv2.jar"/>
- <classpathentry kind="lib" path="input/libinclude/astyanax/astyanax-1.0.4.jar" sourcepath="/Users/dhiller2/AAROOT/area1/Netflix-astyanax-5c05d11/src/main/java"/>
- <classpathentry kind="lib" path="input/libinclude/astyanax/avro-1.4.0-cassandra-1.jar"/>
- <classpathentry kind="lib" path="input/libinclude/astyanax/cassandra-all-1.1.0.jar"/>
- <classpathentry kind="lib" path="input/libinclude/astyanax/cassandra-thrift-1.1.0.jar"/>
- <classpathentry kind="lib" path="input/libinclude/astyanax/commons-cli-1.1.jar"/>
- <classpathentry kind="lib" path="input/libinclude/astyanax/commons-codec-1.3.jar"/>
- <classpathentry kind="lib" path="input/libinclude/astyanax/commons-lang-2.5.jar"/>
- <classpathentry kind="lib" path="input/libinclude/astyanax/commons-logging-1.1.1.jar"/>
- <classpathentry kind="lib" path="input/libinclude/astyanax/compress-lzf-0.8.4.jar"/>
- <classpathentry kind="lib" path="input/libinclude/astyanax/concurrentlinkedhashmap-lru-1.2.jar"/>
- <classpathentry kind="lib" path="input/libinclude/astyanax/guava-11.0.2.jar"/>
- <classpathentry kind="lib" path="input/libinclude/astyanax/high-scale-lib-1.1.2.jar"/>
- <classpathentry kind="lib" path="input/libinclude/astyanax/httpclient-4.0.1.jar"/>
- <classpathentry kind="lib" path="input/libinclude/astyanax/httpcore-4.0.1.jar"/>
- <classpathentry kind="lib" path="input/libinclude/astyanax/jackson-core-asl-1.4.2.jar"/>
- <classpathentry kind="lib" path="input/libinclude/astyanax/jackson-mapper-asl-1.4.2.jar"/>
- <classpathentry kind="lib" path="input/libinclude/astyanax/jamm-0.2.5.jar"/>
- <classpathentry kind="lib" path="input/libinclude/astyanax/jettison-1.3.1.jar"/>
- <classpathentry kind="lib" path="input/libinclude/astyanax/jetty-6.1.22.jar"/>
- <classpathentry kind="lib" path="input/libinclude/astyanax/jetty-util-6.1.22.jar"/>
- <classpathentry kind="lib" path="input/libinclude/astyanax/jline-0.9.94.jar"/>
- <classpathentry kind="lib" path="input/libinclude/astyanax/json-simple-1.1.jar"/>
- <classpathentry kind="lib" path="input/libinclude/astyanax/jsr305-1.3.9.jar"/>
- <classpathentry kind="lib" path="input/libinclude/astyanax/metrics-core-2.0.3.jar"/>
- <classpathentry kind="lib" path="input/libinclude/astyanax/org.apache.servicemix.bundles.commons-csv-1.0-r706900_3.jar"/>
- <classpathentry kind="lib" path="input/libinclude/astyanax/servlet-api-2.5-20081211.jar"/>
- <classpathentry kind="lib" path="input/libinclude/astyanax/servlet-api-2.5.jar"/>
- <classpathentry kind="lib" path="input/libinclude/astyanax/snakeyaml-1.6.jar"/>
- <classpathentry kind="lib" path="input/libinclude/astyanax/snappy-java-1.0.4.1.jar"/>
- <classpathentry kind="lib" path="input/libinclude/astyanax/snaptree-0.1.jar"/>
- <classpathentry kind="lib" path="input/libinclude/astyanax/stax-api-1.0.1.jar"/>
- <classpathentry kind="lib" path="input/libinclude/astyanax/stringtemplate-3.2.jar"/>
- <classpathentry kind="lib" path="input/libinclude/astyanax/uuid-3.2.0.jar"/>
- <classpathentry kind="lib" path="input/libinclude/astyanax/libthrift-0.8.0.jar"/>
- <classpathentry kind="lib" path="input/libinclude/joda-time-2.1-sources.jar"/>
- <classpathentry kind="lib" path="input/libinclude/joda-time-2.1.jar" sourcepath="input/libinclude/joda-time-2.1-sources.jar"/>
- <classpathentry kind="lib" path="input/libinclude/args4j-2.0.21-sources.jar"/>
- <classpathentry kind="lib" path="input/libinclude/args4j-2.0.21.jar"/>
- <classpathentry kind="lib" path="input/libinclude/play-1.2.x-dcdb1f3.jar"/>
+ <classpathentry kind="lib" path="input/libexclude/junit.jar"/>
+ <classpathentry kind="lib" path="input/libexclude/play-1.2.x-dcdb1f3.jar"/>
+ <classpathentry kind="lib" path="output/jardist/playorm-astyanax/antlr-jar-2.7.7.jar"/>
+ <classpathentry kind="lib" path="output/jardist/playorm-astyanax/antlr-jar-3.2.jar"/>
+ <classpathentry kind="lib" path="output/jardist/playorm-astyanax/antlr-runtime-jar-3.2.jar"/>
+ <classpathentry kind="lib" path="output/jardist/playorm-astyanax/astyanax-jar-1.0.6.jar"/>
+ <classpathentry kind="lib" path="output/jardist/playorm-astyanax/avro-jar-1.4.0-cassandra-1.jar"/>
+ <classpathentry kind="lib" path="output/jardist/playorm-astyanax/cassandra-all-jar-1.1.0.jar"/>
+ <classpathentry kind="lib" path="output/jardist/playorm-astyanax/cassandra-thrift-jar-1.1.0.jar"/>
+ <classpathentry kind="lib" path="output/jardist/playorm-astyanax/commons-cli-jar-1.1.jar"/>
+ <classpathentry kind="lib" path="output/jardist/playorm-astyanax/commons-codec-jar-1.2.jar"/>
+ <classpathentry kind="lib" path="output/jardist/playorm-astyanax/commons-lang-jar-2.4.jar"/>
+ <classpathentry kind="lib" path="output/jardist/playorm-astyanax/commons-logging-jar-1.1.1.jar"/>
+ <classpathentry kind="lib" path="output/jardist/playorm-astyanax/compress-lzf-bundle-0.8.4.jar"/>
+ <classpathentry kind="lib" path="output/jardist/playorm-astyanax/concurrentlinkedhashmap-lru-jar-1.2.jar"/>
+ <classpathentry kind="lib" path="output/jardist/playorm-astyanax/guava-jar-r08.jar"/>
+ <classpathentry kind="lib" path="output/jardist/playorm-astyanax/high-scale-lib-jar-1.1.2.jar"/>
+ <classpathentry kind="lib" path="output/jardist/playorm-astyanax/httpclient-jar-4.0.1.jar"/>
+ <classpathentry kind="lib" path="output/jardist/playorm-astyanax/httpcore-jar-4.0.1.jar"/>
+ <classpathentry kind="lib" path="output/jardist/playorm-astyanax/jackson-core-asl-jar-1.4.0.jar"/>
+ <classpathentry kind="lib" path="output/jardist/playorm-astyanax/jackson-mapper-asl-jar-1.4.0.jar"/>
+ <classpathentry kind="lib" path="output/jardist/playorm-astyanax/jamm-jar-0.2.5.jar"/>
+ <classpathentry kind="lib" path="output/jardist/playorm-astyanax/jettison-bundle-1.3.1.jar"/>
+ <classpathentry kind="lib" path="output/jardist/playorm-astyanax/jetty-jar-6.1.22.jar"/>
+ <classpathentry kind="lib" path="output/jardist/playorm-astyanax/jetty-util-jar-6.1.22.jar"/>
+ <classpathentry kind="lib" path="output/jardist/playorm-astyanax/jline-jar-0.9.94.jar"/>
+ <classpathentry kind="lib" path="output/jardist/playorm-astyanax/joda-time-jar-2.0.jar"/>
+ <classpathentry kind="lib" path="output/jardist/playorm-astyanax/json-simple-jar-1.1.jar"/>
+ <classpathentry kind="lib" path="output/jardist/playorm-astyanax/libthrift-jar-0.7.0.jar"/>
+ <classpathentry kind="lib" path="output/jardist/playorm-astyanax/metrics-core-jar-2.0.3.jar"/>
+ <classpathentry kind="lib" path="output/jardist/playorm-astyanax/org.apache.servicemix.bundles.commons-csv-bundle-1.0-r706900_3.jar"/>
+ <classpathentry kind="lib" path="output/jardist/playorm-astyanax/servlet-api-jar-2.5-20081211.jar"/>
+ <classpathentry kind="lib" path="output/jardist/playorm-astyanax/servlet-api-jar-2.5.jar"/>
+ <classpathentry kind="lib" path="output/jardist/playorm-astyanax/slf4j-api-jar-1.6.4.jar"/>
+ <classpathentry kind="lib" path="output/jardist/playorm-astyanax/snakeyaml-jar-1.6.jar"/>
+ <classpathentry kind="lib" path="output/jardist/playorm-astyanax/snappy-java-bundle-1.0.4.1.jar"/>
+ <classpathentry kind="lib" path="output/jardist/playorm-astyanax/snaptree-jar-0.1.jar"/>
+ <classpathentry kind="lib" path="output/jardist/playorm-astyanax/stax-api-jar-1.0.1.jar"/>
+ <classpathentry kind="lib" path="output/jardist/playorm-astyanax/stringtemplate-jar-3.2.1.jar"/>
+ <classpathentry kind="lib" path="output/jardist/playorm-astyanax/uuid-jar-3.2.0.jar"/>
+ <classpathentry kind="lib" path="output/jardist/playorm-inmemory/junit-jar-4.9.jar"/>
+ <classpathentry kind="lib" path="output/jardist/playorm-inmemory/javassist-jar-3.16.1-GA.jar"/>
+ <classpathentry kind="lib" path="output/jardist/playorm-inmemory/activation-jar-1.1.jar"/>
+ <classpathentry kind="lib" path="output/jardist/playorm-inmemory/aopalliance-jar-1.0.jar"/>
+ <classpathentry kind="lib" path="output/jardist/playorm-inmemory/args4j-jar-2.0.16.jar"/>
+ <classpathentry kind="lib" path="output/jardist/playorm-inmemory/asm-jar-3.1.jar"/>
+ <classpathentry kind="lib" path="output/jardist/playorm-inmemory/cglib-jar-2.2.1-v20090111.jar"/>
+ <classpathentry kind="lib" path="output/jardist/playorm-inmemory/geronimo-jms_1.1_spec-jar-1.0.jar"/>
+ <classpathentry kind="lib" path="output/jardist/playorm-inmemory/groovy-all-jar-1.7.6.jar"/>
+ <classpathentry kind="lib" path="output/jardist/playorm-inmemory/guava-bootstrap-jar-11.0.jar"/>
+ <classpathentry kind="lib" path="output/jardist/playorm-inmemory/guava-jar-11.0.jar"/>
+ <classpathentry kind="lib" path="output/jardist/playorm-inmemory/guice-jar-3.0.jar"/>
+ <classpathentry kind="lib" path="output/jardist/playorm-inmemory/guice-javadoc-3.0.jar"/>
+ <classpathentry kind="lib" path="output/jardist/playorm-inmemory/guice-source-3.0.jar"/>
+ <classpathentry kind="lib" path="output/jardist/playorm-inmemory/hamcrest-core-jar-1.1.jar"/>
+ <classpathentry kind="lib" path="output/jardist/playorm-inmemory/janino-jar-2.5.16.jar"/>
+ <classpathentry kind="lib" path="output/jardist/playorm-inmemory/javax.inject-jar-1.jar"/>
+ <classpathentry kind="lib" path="output/jardist/playorm-inmemory/jsr305-jar-1.3.9.jar"/>
+ <classpathentry kind="lib" path="output/jardist/playorm-inmemory/logback-classic-jar-1.0.1.jar"/>
+ <classpathentry kind="lib" path="output/jardist/playorm-inmemory/logback-core-jar-1.0.1.jar"/>
+ <classpathentry kind="lib" path="output/jardist/playorm-inmemory/mail-jar-1.4.jar"/>
+ <classpathentry kind="lib" path="output/jardist/playorm-inmemory/servlet-api-jar-2.5.jar"/>
+ <classpathentry kind="lib" path="output/jardist/playorm-inmemory/slf4j-api-jar-1.6.4.jar"/>
<classpathentry kind="output" path="eclipsegen"/>
</classpath>
View
35 bldfiles/build.xml
@@ -32,9 +32,6 @@
<property name="ivy.install.version" value="2.3.0-rc1"/>
<property name="ivy.jar.dir" value="${tool.dir}/ivy"/>
<property name="ivy.jar.file" value="${ivy.jar.dir}/ivy-${ivy.install.version}.jar"/>
- <property name="ivy.lib.dir" value="${input}/libinclude"/>
-
-
<target name="install-ivy" description="--&gt; install ivy">
<path id="ivy.lib.path">
@@ -49,15 +46,12 @@
<ivy:resolve file="bldfiles/ivy.xml"/>
</target>
- <target name="retrieve" depends="resolve">
- <ivy:retrieve pattern="${ivy.lib.dir}/[conf]/[artifact]-[type]-[revision].[ext]" />
- </target>
-
- <target name="deliver" depends="retrieve">
+ <target name="retrieve" depends="resolve, create-src">
+ <ivy:retrieve pattern="${libinclude}/[conf]/[artifact]-[type]-[revision].[ext]" />
<ivy:deliver deliverpattern="${generated}/ivy/ivy-[module]-[revision].xml" />
</target>
-
- <target name="publish" depends="deliver">
+
+ <target name="publish" depends="all">
<ivy:publish resolver="local" forcedeliver="true">
<artifacts pattern="${input}/libinclude/[artifact].[ext]" />
</ivy:publish>
@@ -93,7 +87,7 @@
<fileset dir="${tool.dir}/antlr">
<include name="**/*.jar"/>
</fileset>
- <fileset dir="${ivy.lib.dir}/build">
+ <fileset dir="${libinclude}/build">
<include name="**/*.jar"/>
</fileset>
</path>
@@ -187,7 +181,7 @@
INIT TASKS
***********************************************************************
-->
- <target name="taskdefs" depends = "retrieve">
+ <target name="taskdefs" depends = "install-ivy">
<tstamp>
<format property="manifest.date" pattern="EE MMMM d yyyy, HH:mm:ss" locale="en" />
</tstamp>
@@ -232,7 +226,7 @@
<target name="create-src" depends="taskdefs">
<mkdir dir="${javacode}" />
- <mkdir dir="${lib}" />
+ <mkdir dir="${libinclude}" />
<mkdir dir="${libexclude}" />
<mkdir dir="${native}" />
<mkdir dir="${schemas}" />
@@ -251,7 +245,7 @@
</target>
- <target name="generateparser" depends="create-src">
+ <target name="generateparser" depends="retrieve">
<java classname="org.antlr.Tool" fork="true" failonerror="true">
<classpath >
<path refid="antlr.lib" />
@@ -265,17 +259,12 @@
</java>
</target>
- <target name="movejars" depends="deliver">
- <move todir="${jardist}">
- <fileset dir="${lib}" includes="**" />
- </move>
- </target>
<!--
***********************************************************************
COMPILE TARGET
***********************************************************************
-->
- <target name="compile" depends="generateparser,movejars">
+ <target name="compile" depends="generateparser">
<mkdir dir="${build}" />
<pathconvert property="compile.classpath" pathsep=":">
@@ -342,7 +331,7 @@
<rmic base="${build}" includes="**\RMI*.class" debug="yes">
<classpath>
<pathelement path="${build}" />
- <fileset dir="${lib}">
+ <fileset dir="${libinclude}">
<include name="**/*.jar" />
</fileset>
</classpath>
@@ -478,7 +467,7 @@
<then>
<!-- copy all jars that need to be in this osgi bundle jar into the directory that will be jarred up-->
<copy todir="${build}">
- <fileset dir="${lib}" includes="**" />
+ <fileset dir="${libinclude}" includes="**" />
</copy>
</then>
<elseif>
@@ -550,7 +539,7 @@
<mkdir dir="${wardist}" />
<war destfile="${war.file}" webxml="${webroot}/WEB-INF/web.xml" manifest="${manifest}/MANIFEST.MF">
- <lib dir="${lib}">
+ <lib dir="${libinclude}">
<include name="**/*.jar"/>
</lib>
<classes dir="${build}" />
View
1 bldfiles/configDesign.xml
@@ -61,7 +61,6 @@
</package>
<package name="apiutil" package="com.alvazan.orm.api.util">
- <depends>astyanax</depends>
<depends>allapis</depends>
</package>
View
2 bldfiles/directory.properties
@@ -100,7 +100,7 @@ javacode =${input}/javasrc
webroot =${input}/webroot
#Contains all html, jsp, gif, jpg's, WEB-INF/web.xml, WEB-INF/faces-config.xml, etc. etc
-lib =${input}/libinclude
+libinclude =${generated}/jardist
#contains all *.jar needed to run the app and that need to be deployed with the app
#does not contain *.jars needed to compile the app(such as junit.jar)
libexclude =${input}/libexclude
View
104 input/javasrc/com/alvazan/orm/api/util/NoSql.java
@@ -1,104 +0,0 @@
-package com.alvazan.orm.api.util;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.alvazan.orm.api.base.Bootstrap;
-import com.alvazan.orm.api.base.DbTypeEnum;
-import com.alvazan.orm.api.base.NoSqlEntityManager;
-import com.alvazan.orm.api.base.NoSqlEntityManagerFactory;
-import com.netflix.astyanax.AstyanaxContext.Builder;
-
-public class NoSql {
-
- private static final Logger log = LoggerFactory.getLogger(NoSql.class);
- private static NoSqlEntityManagerFactory factory;
-
- private static ThreadLocal<State> entityManager = new ThreadLocal<State>();
- @SuppressWarnings("rawtypes")
- private static Class testClass;
- private static PlayCallback playCallback;
-
- @SuppressWarnings("rawtypes")
- public static void initialize(PlayCallback callback, DbTypeEnum serverType, Builder builder) {
- if(factory != null)
- return;
-
- log.info("Factory is null so we are intializing it");
-
- playCallback = callback;
- List<Class> list = callback.getClassesToScan();
- ClassLoader cl = callback.getClassLoader();
- testClass = list.get(0);
-
- Map<String, Object> props = new HashMap<String, Object>();
- props.put(Bootstrap.AUTO_CREATE_KEY, "create");
- props.put(Bootstrap.LIST_OF_EXTRA_CLASSES_TO_SCAN_KEY, list);
- props.put(Bootstrap.CASSANDRA_BUILDER, builder);
- NoSqlEntityManagerFactory f = Bootstrap.create(serverType, props, null, cl);
- factory = f;
- } // initialize
-
- @SuppressWarnings("rawtypes")
- private static void testForRescan() {
- List<Class> classesToScan = playCallback.getClassesToScan();
- Class newClass = classesToScan.get(0);
- if(newClass == testClass)
- return;
-
- //otherwise, we need a rescan of all the new classes
- ClassLoader cl = playCallback.getClassLoader();
- factory.rescan(classesToScan, cl);
- testClass = newClass;
- }
-
- /**
- * Returns the same entity manager if you are in the same request scope so you keep getting the same entitymanager for a request
- * @return
- */
- public static NoSqlEntityManager em() {
- testForRescan();
- Object request = playCallback.getCurrentRequest();
- State state = entityManager.get();
- if(state == null) {
- return createNewEm(request);
- } else if(state.getRequest() == request) {
- return state.getEm();
- }
- //otherwise this is a new request needing a new em
- return createNewEm(request);
- } // em
-
- private static NoSqlEntityManager createNewEm(Object request) {
- State state;
- state = new State();
- state.setRequest(request);
- state.setEm(factory.createEntityManager());
- entityManager.set(state);
- return state.getEm();
- }
-
- private static class State {
- private NoSqlEntityManager em;
- private Object request;
-
- public NoSqlEntityManager getEm() {
- return em;
- }
- public void setEm(NoSqlEntityManager em) {
- this.em = em;
- }
- public Object getRequest() {
- return request;
- }
- public void setRequest(Object request) {
- this.request = request;
- }
-
- }
-
-}
View
13 input/javasrc/com/alvazan/orm/api/util/PlayCallback.java
@@ -1,13 +0,0 @@
-package com.alvazan.orm.api.util;
-
-import java.util.List;
-
-public interface PlayCallback {
-
- @SuppressWarnings("rawtypes")
- List<Class> getClassesToScan();
-
- ClassLoader getClassLoader();
-
- Object getCurrentRequest();
-}

0 comments on commit 36d684c

Please sign in to comment.
Something went wrong with that request. Please try again.