From 4271f6d9e1b10b03ac1cdc60ce65bd01c5abcf85 Mon Sep 17 00:00:00 2001
From: Ben Hale <bhale@vmware.com>
Date: Wed, 19 Nov 2008 15:13:53 +0000
Subject: [PATCH] Upgrade to spring-build.  Added dm Server library file

---
 build-spring-framework/build.xml              |  1 +
 org.springframework.spring-library/build.xml  |  6 ++++
 org.springframework.spring-library/ivy.xml    | 35 +++++++++++++++++++
 .../org.springframework.spring-library.libd   | 17 +++++++++
 4 files changed, 59 insertions(+)
 create mode 100644 org.springframework.spring-library/build.xml
 create mode 100644 org.springframework.spring-library/ivy.xml
 create mode 100644 org.springframework.spring-library/org.springframework.spring-library.libd

diff --git a/build-spring-framework/build.xml b/build-spring-framework/build.xml
index 0df1c330ab..c7f09aa05a 100644
--- a/build-spring-framework/build.xml
+++ b/build-spring-framework/build.xml
@@ -19,6 +19,7 @@
 		<pathelement location="../org.springframework.web.servlet"/>
 		<pathelement location="../org.springframework.web.portlet"/>
 		<pathelement location="../org.springframework.test"/>
+		<pathelement location="../org.springframework.spring-library"/>
 	</path>
 
 	<property file="${basedir}/../build.properties"/>
diff --git a/org.springframework.spring-library/build.xml b/org.springframework.spring-library/build.xml
new file mode 100644
index 0000000000..de198b0eb4
--- /dev/null
+++ b/org.springframework.spring-library/build.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="org.springframework.spring-library">
+	<property file="${basedir}/../build.properties"/>
+	<import file="${basedir}/../build-spring-framework/package-library.xml"/>
+	<import file="${basedir}/../spring-build/library/default.xml"/>
+</project>
diff --git a/org.springframework.spring-library/ivy.xml b/org.springframework.spring-library/ivy.xml
new file mode 100644
index 0000000000..aefc348d26
--- /dev/null
+++ b/org.springframework.spring-library/ivy.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
+<ivy-module
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
+		version="1.3">
+
+	<info organisation="org.springframework" module="${ant.project.name}">
+		<license name="Apache 2.0" url="http://www.apache.org/licenses/LICENSE-2.0"/>
+	</info>
+
+	<configurations>
+		<include file="${spring.build.dir}/common/default-ivy-configurations.xml"/>
+	</configurations>
+
+	<publications>
+		<artifact name="${ant.project.name}" type="library" ext="libd"/>
+	</publications>
+
+	<dependencies>
+		<dependency org="org.springframework" name="org.springframework.aop" rev="latest.integration" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.context.support" rev="latest.integration" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.jdbc" rev="latest.integration" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.jms" rev="latest.integration" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.orm" rev="latest.integration" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.transaction" rev="latest.integration" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.web" rev="latest.integration" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.web.servlet" rev="latest.integration" conf="compile->compile"/>
+		<dependency org="org.aopalliance" name="com.springsource.org.aopalliance" rev="1.0.0" conf="compile->compile"/>
+	</dependencies>
+
+</ivy-module>
diff --git a/org.springframework.spring-library/org.springframework.spring-library.libd b/org.springframework.spring-library/org.springframework.spring-library.libd
new file mode 100644
index 0000000000..8f42570e9e
--- /dev/null
+++ b/org.springframework.spring-library/org.springframework.spring-library.libd
@@ -0,0 +1,17 @@
+Library-SymbolicName: org.springframework.spring
+Library-Version: @bundle.version@
+Library-Name: Spring Framework
+Import-Bundle: 
+ org.springframework.aop;version="[@bundle.version@, @bundle.version@]",
+ org.springframework.aspects;version="[@bundle.version@, @bundle.version@]";import-scope:=application,
+ org.springframework.beans;version="[@bundle.version@, @bundle.version@]",
+ org.springframework.context;version="[@bundle.version@, @bundle.version@]",
+ org.springframework.context.support;version="[@bundle.version@, @bundle.version@]",
+ org.springframework.core;version="[@bundle.version@, @bundle.version@]",
+ org.springframework.jdbc;version="[@bundle.version@, @bundle.version@]",
+ org.springframework.jms;version="[@bundle.version@, @bundle.version@]",
+ org.springframework.orm;version="[@bundle.version@, @bundle.version@]",
+ org.springframework.transaction;version="[@bundle.version@, @bundle.version@]",
+ org.springframework.web;version="[@bundle.version@, @bundle.version@]",
+ org.springframework.web.servlet;version="[@bundle.version@, @bundle.version@]",
+ com.springsource.org.aopalliance;version="[1.0.0, 1.0.0]"