You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@lucene.apache.org by si...@apache.org on 2006/11/11 16:03:13 UTC
svn commit: r473722 - in /lucene/java/trunk/contrib/gdata-server:
CHANGES.txt build.xml gdata-build/get-dependencies.xml
gdata-build/hivemind-build.xml gdata-build/ioc-container.xml
Author: simonw
Date: Sat Nov 11 07:03:13 2006
New Revision: 473722
URL: http://svn.apache.org/viewvc?view=rev&rev=473722
Log:
Changed Build management to create jar files for core and IoC Container.
Added Changes.txt file to document changes in build management, api, history and bug fixes
Added:
lucene/java/trunk/contrib/gdata-server/CHANGES.txt
lucene/java/trunk/contrib/gdata-server/gdata-build/hivemind-build.xml
lucene/java/trunk/contrib/gdata-server/gdata-build/ioc-container.xml
Modified:
lucene/java/trunk/contrib/gdata-server/build.xml
lucene/java/trunk/contrib/gdata-server/gdata-build/get-dependencies.xml
Added: lucene/java/trunk/contrib/gdata-server/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/gdata-server/CHANGES.txt?view=auto&rev=473722
==============================================================================
--- lucene/java/trunk/contrib/gdata-server/CHANGES.txt (added)
+++ lucene/java/trunk/contrib/gdata-server/CHANGES.txt Sat Nov 11 07:03:13 2006
@@ -0,0 +1,15 @@
+Lucene GData-Server change log
+
+$Id:$
+
+trunk (not yet release)
+
+Build management (Ant)
+1. Changes to fetch third-party libs via maven repository
+ - Added build file folder ./gdata-build
+ - created macroes to fetch jar files in ./gdata-build/dependencies.xml
+ - created tasks to fetch runtime, build and test relevant jar files in ./gdata-build/get-dependencies.xml
+
+2. Changed build management to create core and IoC / DI container jars to enable replacement of the container impl.
+ - created default IoC container build in ./gdata-build/hivemind-build.xml
+
\ No newline at end of file
Modified: lucene/java/trunk/contrib/gdata-server/build.xml
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/gdata-server/build.xml?view=diff&rev=473722&r1=473721&r2=473722
==============================================================================
--- lucene/java/trunk/contrib/gdata-server/build.xml (original)
+++ lucene/java/trunk/contrib/gdata-server/build.xml Sat Nov 11 07:03:13 2006
@@ -1,10 +1,28 @@
<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
<project name="gdata-server" default="default">
<description>
Serverside Google Data API implementation
</description>
<import file="gdata-build/get-dependencies.xml" />
+ <import file="gdata-build/ioc-container.xml" />
<property name="javac.source" value="1.5" />
<property name="javac.target" value="1.5" />
<property name="gdata.war.name" value="gdata-server" />
@@ -44,7 +62,7 @@
</classpath>
<exclude name="org/apache/lucene/gdata/storage/db4o/**" unless="db4o.jar.present" />
</compile>
-
+ <antcall target="compile-IoC-container"/>
</target>
<target name="compile-test" depends="compile-core">
@@ -65,7 +83,7 @@
<pathconvert property="project.classpath" targetos="unix" refid="additional.dependencies" />
<import file="../contrib-build.xml" />
- <target name="prepare-dist" depends="jar-core">
+ <target name="prepare-dist" depends="jar-core,jar-IoC-container">
<echo>Prepare dist directory</echo>
<delete dir="${dist.dir}" />
<mkdir dir="${dist.dir}" />
@@ -101,6 +119,7 @@
</lib>
<lib dir="${build.dir}" includes="${final.name}.jar" />
+ <lib dir="${build.dir}" includes="${ioc.container.jar}" />
<lib file="${lucene.jar}" />
</war>
</target>
Modified: lucene/java/trunk/contrib/gdata-server/gdata-build/get-dependencies.xml
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/gdata-server/gdata-build/get-dependencies.xml?view=diff&rev=473722&r1=473721&r2=473722
==============================================================================
--- lucene/java/trunk/contrib/gdata-server/gdata-build/get-dependencies.xml (original)
+++ lucene/java/trunk/contrib/gdata-server/gdata-build/get-dependencies.xml Sat Nov 11 07:03:13 2006
@@ -1,18 +1,20 @@
<?xml version="1.0"?>
<!--
- Copyright 2004, 2005 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
-->
<project name="get-dependencies">
@@ -49,7 +51,6 @@
</target>
<target name="test-dependencies">
<echo>Resolving dependencies for test cases</echo>
- <!-- <antcall target="common-dependencies"/>-->
<ibiblio-dependency artifact="easymock" version="1.2_Java1.5" group="easymock" folder="easymock/1.2_Java1.5" />
<path id="test.build.path">
<fileset dir="${gdata.external.lib.dir}">
Added: lucene/java/trunk/contrib/gdata-server/gdata-build/hivemind-build.xml
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/gdata-server/gdata-build/hivemind-build.xml?view=auto&rev=473722
==============================================================================
--- lucene/java/trunk/contrib/gdata-server/gdata-build/hivemind-build.xml (added)
+++ lucene/java/trunk/contrib/gdata-server/gdata-build/hivemind-build.xml Sat Nov 11 07:03:13 2006
@@ -0,0 +1,70 @@
+<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+
+<project name="gdata-server-hivemind" >
+<property name="ioc.container.jar" value="${final.name}-hivemind.jar"/>
+ <description>
+ Compiles and Jars the hivemind dependencies for gdata-server
+ </description>
+ <target name="prepare-IoC-container">
+ <available file="${build.dir}/${final.name}.jar" property="gdata.core.jar.present"/>
+ <fail unless="${gdata.core.jar.present}" message="Must gdata core jar first. run build.xml - 'jar-core' task"/>
+ <path id="IoC.container.build.path">
+ <fileset dir="${build.dir}">
+ <include name="${final.name}.jar"/>
+ </fileset>
+ </path>
+
+ </target>
+ <!-- redefine compile-core and compile-test to exclude 3rd party dependend sources -->
+ <target name="compile-IoC-container" depends="prepare-IoC-container">
+ <echo>Compile IoC Container classes</echo>
+ <compile srcdir="src/hivemind" destdir="${build.dir}/classes/hivemind">
+ <classpath>
+ <path refid="classpath"/>
+ <path refid="build.path"/>
+ <path refid="IoC.container.build.path"/>
+ </classpath>
+ </compile>
+ </target>
+
+ <target name="jar-IoC-container" depends="compile-IoC-container">
+ <echo>Jar IoC Container classes and metadata</echo>
+ <jar
+ destfile="${build.dir}/${ioc.container.jar}"
+ basedir="${build.dir}/classes/hivemind">
+ <manifest>
+ <attribute name="Created-By" value="Apache Jakarta"/>
+ <section name="org/apache/lucene/">
+ <attribute name="Specifica tion-Title" value="Lucene Search Engine"/>
+ <attribute name="Specification-Version" value="${version}"/>
+ <attribute name="Specification-Vendor" value="Lucene"/>
+ <attribute name="Implementation-Title" value="org.apache.lucene"/>
+ <attribute name="Implementation-Version" value="build ${DSTAMP}"/>
+ <attribute name="Implementation-Vendor" value="Lucene"/>
+ </section>
+ </manifest>
+ </jar>
+ </target>
+
+
+
+
+
+</project>
\ No newline at end of file
Added: lucene/java/trunk/contrib/gdata-server/gdata-build/ioc-container.xml
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/gdata-server/gdata-build/ioc-container.xml?view=auto&rev=473722
==============================================================================
--- lucene/java/trunk/contrib/gdata-server/gdata-build/ioc-container.xml (added)
+++ lucene/java/trunk/contrib/gdata-server/gdata-build/ioc-container.xml Sat Nov 11 07:03:13 2006
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<project name="gdata-ioc-container">
+<import file="hivemind-build.xml"/>
+<target name="compile-IoC-container"/>
+<target name="jar-IoC-container" depends="compile-IoC-container"/>
+</project>
\ No newline at end of file