From 33826aea2785e86a734deea6abb09cdccce53b80 Mon Sep 17 00:00:00 2001
From: Massimiliano Assante <massimiliano.assante@isti.cnr.it>
Date: Mon, 22 Apr 2013 16:47:42 +0000
Subject: [PATCH] 2.14

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/admin/resource-management@73869 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .classpath                                  | 6 +++---
 .settings/com.google.gdt.eclipse.core.prefs | 4 ++--
 .settings/org.eclipse.wst.common.component  | 3 ---
 distro/changelog.xml                        | 5 +++++
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/.classpath b/.classpath
index fb6bcdd..0c16ce3 100644
--- a/.classpath
+++ b/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/resource-management-4.0.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
+	<classpathentry kind="src" output="target/resource-management-4.1.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
@@ -23,6 +23,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry combineaccessrules="false" kind="src" path="/rmp-common-library"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
@@ -34,6 +35,5 @@
 			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry combineaccessrules="false" kind="src" path="/rmp-common-library"/>
-	<classpathentry kind="output" path="target/resource-management-4.0.0-SNAPSHOT/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/resource-management-4.1.0-SNAPSHOT/WEB-INF/classes"/>
 </classpath>
diff --git a/.settings/com.google.gdt.eclipse.core.prefs b/.settings/com.google.gdt.eclipse.core.prefs
index a2bcbaf..9a99fa2 100644
--- a/.settings/com.google.gdt.eclipse.core.prefs
+++ b/.settings/com.google.gdt.eclipse.core.prefs
@@ -1,6 +1,6 @@
-#Wed Feb 27 16:43:28 CET 2013
+#Fri Mar 01 11:59:40 CET 2013
 eclipse.preferences.version=1
 jarsExcludedFromWebInfLib=
-lastWarOutDir=/Users/massi/Documents/workspace/resource-management/target/resource-management-4.0.0-SNAPSHOT
+lastWarOutDir=/Users/massi/Documents/workspace/resource-management/target/resource-management-4.1.0-SNAPSHOT
 warSrcDir=src/main/webapp
 warSrcDirIsOutput=false
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index c72f385..028380e 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -7,9 +7,6 @@
         <dependent-module archiveName="rmp-common-library-1.1.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/rmp-common-library/rmp-common-library">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module archiveName="activation-record-widgets-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/activation-record-widgets/activation-record-widgets">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
     <property name="java-output-path" value="/${module}/target/www/WEB-INF/classes"/>
         <property name="context-root" value="resource-management"/>
   </wb-module>
diff --git a/distro/changelog.xml b/distro/changelog.xml
index f58076e..204e57a 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,5 +1,10 @@
 <ReleaseNotes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="xsd/changelog.xsd">
+	<Changeset
+		component="org.gcube.portlets-admin.resource-management-portlet-servicearchive.4-1-0"
+		date="2013-02-27">
+		<Change>added activation record widget as external module</Change>
+	</Changeset>
 	<Changeset
 		component="org.gcube.portlets-admin.resource-management-portlet-servicearchive.4-0-0"
 		date="2013-02-27">