Mercurial > hg > IndexMetaContextualizer

changeset 5:7d231e4e86e5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
environment setting
author Jorge Urzua <jurzua@mpiwg-berlin.mpg.de>
date Fri, 12 Apr 2013 14:28:32 +0200
parents 45be34377487
children 7a2a98655236 bc57f2660b0f
files .settings/.jsdtscope .settings/org.eclipse.jdt.core.prefs .settings/org.eclipse.wst.common.component .settings/org.eclipse.wst.common.project.facet.core.prefs.xml .settings/org.eclipse.wst.common.project.facet.core.xml .settings/org.eclipse.wst.jsdt.ui.superType.container .settings/org.eclipse.wst.jsdt.ui.superType.name pom.xml src/main/java/de/mpiwg/indexmeta/IndexMetaParser.java src/main/java/de/mpiwg/indexmeta/bo/Contextualization.java
diffstat 10 files changed, 126 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.settings/.jsdtscope	Fri Apr 12 14:28:32 2013 +0200
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="WebContent"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
+		<attributes>
+			<attribute name="hide" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
+	<classpathentry kind="output" path=""/>
+</classpath>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.settings/org.eclipse.jdt.core.prefs	Fri Apr 12 14:28:32 2013 +0200
@@ -0,0 +1,8 @@
+#Fri Apr 12 10:56:55 CEST 2013
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.settings/org.eclipse.wst.common.component	Fri Apr 12 14:28:32 2013 +0200
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+    <wb-module deploy-name="IndexMetaContextualizer">
+        <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
+        <property name="context-root" value="IndexMetaContextualizer"/>
+        <property name="java-output-path" value="/IndexMetaContextualizer/target/classes"/>
+    </wb-module>
+</project-modules>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml	Fri Apr 12 14:28:32 2013 +0200
@@ -0,0 +1,7 @@
+<root>
+  <facet id="jst.jsf">
+    <node name="libprov">
+      <attribute name="provider-id" value="jsf-user-library-provider"/>
+    </node>
+  </facet>
+</root>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.settings/org.eclipse.wst.common.project.facet.core.xml	Fri Apr 12 14:28:32 2013 +0200
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <fixed facet="wst.jsdt.web"/>
+  <installed facet="java" version="1.6"/>
+  <installed facet="jst.web" version="3.0"/>
+  <installed facet="jst.jsf" version="2.0"/>
+  <installed facet="wst.jsdt.web" version="1.0"/>
+</faceted-project>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.settings/org.eclipse.wst.jsdt.ui.superType.container	Fri Apr 12 14:28:32 2013 +0200
@@ -0,0 +1,1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.settings/org.eclipse.wst.jsdt.ui.superType.name	Fri Apr 12 14:28:32 2013 +0200
@@ -0,0 +1,1 @@
+Window
\ No newline at end of file
--- a/pom.xml	Fri Apr 12 13:21:16 2013 +0200
+++ b/pom.xml	Fri Apr 12 14:28:32 2013 +0200
@@ -4,14 +4,29 @@
 
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>de.mpiwg.indexmeta</groupId>
-	<artifactId>indexmeta</artifactId>
-	<packaging>jar</packaging>
+	<artifactId>IndexMetaContextualizer</artifactId>
+	<packaging>war</packaging>
 	<version>1.0-SNAPSHOT</version>
 	<name>de.mpiwg.indexmeta</name>
 
+    <repositories>
+	     <repository>
+	        <id>snapshots</id>
+	        <url>http://anonsvn.icefaces.org/repo/maven2/releases/</url>
+	     </repository>    
+    </repositories>
+
 	<build>
 		<directory>target</directory>
+		<!-- 
 		<sourceDirectory>src/main/java</sourceDirectory>
+		-->
+		<resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>		
 		
 	    <plugins>
 	        <plugin>
@@ -28,16 +43,65 @@
 	</build>
 
 	<dependencies>
+	    <!-- compat -->	
+		<dependency>
+		    <groupId>org.icefaces</groupId>
+		    <artifactId>icefaces-compat</artifactId>
+		    <version>3.2.0</version>
+		    <exclusions>
+	        	<exclusion>
+	        		<artifactId>jsp-api</artifactId>
+	        		<groupId>javax.servlet.jsp</groupId>
+	        	</exclusion>
+	        </exclusions>
+
+		</dependency>
+		<dependency>
+		  <groupId>org.glassfish</groupId>
+		  <artifactId>javax.faces</artifactId>
+		  <version>2.1.6</version>
+		</dependency>			
+		<!--  
+		<dependency>
+		    <groupId>javax.el</groupId>
+		    <artifactId>el-api</artifactId>
+		    <version>1.0</version>
+		</dependency>
+		<dependency>
+		    <groupId>javax.servlet</groupId>
+		    <artifactId>jstl</artifactId>
+		    <version>1.2</version>
+		</dependency>		
+		<dependency>
+		    <groupId>commons-beanutils</groupId>
+		    <artifactId>commons-beanutils</artifactId>
+		    <version>1.8.0</version>
+		</dependency>	
+		<dependency>
+		    <groupId>commons-logging</groupId>
+		    <artifactId>commons-logging</artifactId>
+		    <version>1.1.1</version>
+		</dependency>			
+		             -->	
+        <!-- compat -->	   
+	    
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-entitymanager</artifactId>
 			<version>3.5.5-Final</version>
 		</dependency>
 		<dependency>
-			<groupId>commons-logging</groupId>
-			<artifactId>commons-logging</artifactId>
-			<version>1.0.4</version>
+		    <groupId>log4j</groupId>
+		    <artifactId>log4j</artifactId>
+		    <version>1.2.17</version>
 		</dependency>
+
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+            <version>2.6</version>
+        </dependency>
+		
 		<dependency>
 			<groupId>c3p0</groupId>
 			<artifactId>c3p0</artifactId>
@@ -60,6 +124,14 @@
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
+		<!-- 
+		<dependency>
+		    <groupId>javax</groupId>
+		    <artifactId>javaee-api</artifactId>
+		    <version>6.0</version>
+		</dependency>
+		 -->
+		
 
 	</dependencies>
 
--- a/src/main/java/de/mpiwg/indexmeta/IndexMetaParser.java	Fri Apr 12 13:21:16 2013 +0200
+++ b/src/main/java/de/mpiwg/indexmeta/IndexMetaParser.java	Fri Apr 12 14:28:32 2013 +0200
@@ -38,7 +38,7 @@
 					rs.add(ctx);
 				}				
 			}
-			
+
 			nodes = getNodeList(doc, Contextualization.CITY);
 			for(Node node : nodes){
 				Contextualization ctx = getCtx(node, "XX");
--- a/src/main/java/de/mpiwg/indexmeta/bo/Contextualization.java	Fri Apr 12 13:21:16 2013 +0200
+++ b/src/main/java/de/mpiwg/indexmeta/bo/Contextualization.java	Fri Apr 12 14:28:32 2013 +0200
@@ -85,7 +85,7 @@
 	}
 
 	public QuadKey<String, String, String> getKey(){
-		return new QuadKey<String, String, String>(indexMetaId, elementId, remoteId, id);
+		return new QuadKey<String, String, String>(indexMetaId, type, remoteId, id);
 	}
 	
 	@Override