Menu
▾
▴
[Cse-ip-svn-commits] SF.net SVN: cse-ip:[30] cse-ip/trunk/sandbox/cse-ip
|
From: <id...@us...> - 2009-02-23 19:29:41
|
Revision: 30
http://cse-ip.svn.sourceforge.net/cse-ip/?rev=30&view=rev
Author: idueppe
Date: 2009-02-23 19:29:30 +0000 (Mon, 23 Feb 2009)
Log Message:
-----------
- some refactoring of moving classes into the right package
- add new ear module to contain all service components
- delete obsolete folders
Modified Paths:
--------------
cse-ip/trunk/sandbox/cse-ip/ica-his-lsf/pom.xml
cse-ip/trunk/sandbox/cse-ip/pom.xml
cse-ip/trunk/sandbox/cse-ip/sc-idmapper/pom.xml
Added Paths:
-----------
cse-ip/trunk/sandbox/cse-ip/cse-ip-application/
cse-ip/trunk/sandbox/cse-ip/cse-ip-application/pom.xml
cse-ip/trunk/sandbox/cse-ip/ica-his-lsf/src/test/java/de/campussource/cse/lsf/
cse-ip/trunk/sandbox/cse-ip/ica-his-lsf/src/test/java/de/campussource/cse/lsf/ica/
cse-ip/trunk/sandbox/cse-ip/ica-his-lsf/src/test/java/de/campussource/cse/lsf/ica/CamelTest.java
Removed Paths:
-------------
cse-ip/trunk/sandbox/cse-ip/ica-his-lsf/src/test/java/de/campussource/cse/CamelTest.java
cse-ip/trunk/sandbox/cse-ip/src/main/
cse-ip/trunk/sandbox/cse-ip/src/test/
Added: cse-ip/trunk/sandbox/cse-ip/cse-ip-application/pom.xml
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/cse-ip-application/pom.xml (rev 0)
+++ cse-ip/trunk/sandbox/cse-ip/cse-ip-application/pom.xml 2009-02-23 19:29:30 UTC (rev 30)
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>cse-ip</artifactId>
+ <groupId>de.campussource.cse</groupId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>de.campussource.cse</groupId>
+ <artifactId>cse-ip-application</artifactId>
+ <packaging>ear</packaging>
+ <name>Service Component Enterprise Application</name>
+ <version>1.0-SNAPSHOT</version>
+
+ <dependencies>
+ <dependency>
+ <groupId>de.campussource.cse</groupId>
+ <artifactId>sc-idmapper</artifactId>
+ <version>${pom.version}</version>
+ <type>ejb</type>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-ear-plugin</artifactId>
+ <configuration>
+ <displayName>CSE-IP</displayName>
+ <description>CampusSource Engine Integration Platform</description>
+ <version>1.4</version>
+ <modules>
+ <ejbModule>
+ <groupId>de.campussource.cse</groupId>
+ <artifactId>sc-idmapper</artifactId>
+ </ejbModule>
+ </modules>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.glassfish.maven.plugin</groupId>
+ <artifactId>maven-glassfish-plugin</artifactId>
+ <version>2.1</version>
+ <configuration>
+ <glassfishDirectory>${glassfish.home}</glassfishDirectory>
+ <user>admin</user>
+ <passwordFile>${glassfish.home}/domains/domain1/config/domain-passwords</passwordFile>
+ <autoCreate>false</autoCreate>
+ <debug>true</debug>
+ <echo>true</echo>
+ <terse>false</terse>
+ <domain>
+ <name>domain1</name>
+ <httpPort>8080</httpPort>
+ <adminPort>4848</adminPort>
+ <reuse>true</reuse>
+ </domain>
+ <components>
+ <component>
+ <name>${project.artifactId}</name>
+ <artifact>${project.build.directory}/${project.build.finalName}.ear</artifact>
+ </component>
+ </components>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
\ No newline at end of file
Property changes on: cse-ip/trunk/sandbox/cse-ip/cse-ip-application/pom.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: cse-ip/trunk/sandbox/cse-ip/ica-his-lsf/pom.xml
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/ica-his-lsf/pom.xml 2009-02-23 19:23:10 UTC (rev 29)
+++ cse-ip/trunk/sandbox/cse-ip/ica-his-lsf/pom.xml 2009-02-23 19:29:30 UTC (rev 30)
@@ -37,16 +37,23 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core</artifactId>
- <version>1.6.0</version>
+ <version>${camel.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring</artifactId>
+ <version>${camel.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-spring</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-jms</artifactId>
</dependency>
<dependency>
@@ -69,20 +76,12 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
- <version>2.5.6</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
- <version>2.5.6</version>
</dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
- <version>1.6.0</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
+
</dependencies>
</project>
\ No newline at end of file
Deleted: cse-ip/trunk/sandbox/cse-ip/ica-his-lsf/src/test/java/de/campussource/cse/CamelTest.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/ica-his-lsf/src/test/java/de/campussource/cse/CamelTest.java 2009-02-23 19:23:10 UTC (rev 29)
+++ cse-ip/trunk/sandbox/cse-ip/ica-his-lsf/src/test/java/de/campussource/cse/CamelTest.java 2009-02-23 19:29:30 UTC (rev 30)
@@ -1,131 +0,0 @@
-package de.campussource.cse;
-
-
-
-import static org.junit.Assert.*;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.List;
-
-import org.apache.camel.EndpointInject;
-import org.apache.camel.Exchange;
-import org.apache.camel.Produce;
-import org.apache.camel.ProducerTemplate;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.spring.SpringCamelContext;
-import org.apache.log4j.Logger;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
-
-
-@ContextConfiguration(locations={"classpath:META-INF/camel-context.xml"})
-public class CamelTest extends AbstractJUnit4SpringContextTests{
-
- private static final Logger logger = Logger.getLogger(CamelTest.class);
-
- @EndpointInject(uri = "mock:transformationResult")
- protected MockEndpoint result;
-
- @Produce(uri="activemq:StartLsf2CseProcess")
- protected ProducerTemplate template;
-
- @Autowired
- SpringCamelContext camelContext;
-
- protected RouteBuilder createRouteBuilder() throws Exception {
- return new RouteBuilder() {
- public void configure() {
- errorHandler(deadLetterChannel("mock:error")
- .maximumRedeliveries(0));
- from("activemq:AccountMessageHansen").to("mock:transformationResult");
- }
- };
- }
-
- @Before
- public void before(){
- try {
- RouteBuilder newRoutes = createRouteBuilder();
- camelContext.addRoutes(newRoutes);
- logger.info("----------> routes set");
- } catch (Exception e) {
- logger.error("Error setting up test case");
- }
- }
-
- @After
- public void after(){
- try {
- camelContext.stop();
- } catch (Exception e) {
- logger.error("Error tearing down test case");
- }
- }
-
- @Test
- public void testFirstSteps() throws Exception {
- String input = getLsfSyncMessage();
- String output = getHansenMessage();
- result.expectedBodiesReceived(output);
- logger.info("----------> sending message");
- template.sendBody(input);
- logger.info("----------> message send");
- //for building purposes set to NOTsatisfied, test is not working
- result.setResultWaitTime(8000L);
-
- //assertion does not work properly
- //result.assertIsSatisfied();
- for (Exchange exchange : result.getExchanges()){
- assertTrue(exchange.getIn().getBody(String.class).equals(output));
- }
-
- }
-
- public String getLsfSyncMessage(){
- try{
- return readFileAsString("messages/lsf-sync-msg-original.xml");
- }
- catch (IOException ioe){
- logger.error("Could not retrieve lsf-sync-msg-original.xml");
- logger.error(ioe.getStackTrace());
- }
- return "";
- }
-
- public String getHansenMessage(){
- try{
- return readFileAsString("messages/Hansen.xml");
- }
- catch (IOException ioe){
- logger.error("Could not retrieve Hansen.xml");
- logger.error(ioe.getStackTrace());
- }
- return "";
- }
-
- private String readFileAsString(String filePath)
- throws java.io.IOException{
- InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream(filePath);
- StringBuilder sb = new StringBuilder();
- BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream));
- String line;
- boolean first = true;
- while((line = reader.readLine()) != null){
- if (!first){
- sb.append('\n');
- }
- first = false;
- sb.append(line);
- }
- reader.close();
- return sb.toString();
- }
-}
\ No newline at end of file
Copied: cse-ip/trunk/sandbox/cse-ip/ica-his-lsf/src/test/java/de/campussource/cse/lsf/ica/CamelTest.java (from rev 27, cse-ip/trunk/sandbox/cse-ip/ica-his-lsf/src/test/java/de/campussource/cse/CamelTest.java)
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/ica-his-lsf/src/test/java/de/campussource/cse/lsf/ica/CamelTest.java (rev 0)
+++ cse-ip/trunk/sandbox/cse-ip/ica-his-lsf/src/test/java/de/campussource/cse/lsf/ica/CamelTest.java 2009-02-23 19:29:30 UTC (rev 30)
@@ -0,0 +1,121 @@
+package de.campussource.cse.lsf.ica;
+
+import static org.junit.Assert.assertTrue;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+
+import org.apache.camel.EndpointInject;
+import org.apache.camel.Exchange;
+import org.apache.camel.Produce;
+import org.apache.camel.ProducerTemplate;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.spring.SpringCamelContext;
+import org.apache.log4j.Logger;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
+
+@ContextConfiguration(locations = { "classpath:META-INF/camel-context.xml" })
+public class CamelTest extends AbstractJUnit4SpringContextTests {
+
+ private static final Logger logger = Logger.getLogger(CamelTest.class);
+
+ @EndpointInject(uri = "mock:transformationResult")
+ protected MockEndpoint result;
+
+ @Produce(uri = "activemq:StartLsf2CseProcess")
+ protected ProducerTemplate template;
+
+ @Autowired
+ SpringCamelContext camelContext;
+
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ public void configure() {
+ errorHandler(deadLetterChannel("mock:error").maximumRedeliveries(0));
+ from("activemq:AccountMessageHansen").to("mock:transformationResult");
+ }
+ };
+ }
+
+ @Before
+ public void before() {
+ try {
+ RouteBuilder newRoutes = createRouteBuilder();
+ camelContext.addRoutes(newRoutes);
+ logger.info("----------> routes set");
+ } catch (Exception e) {
+ logger.error("Error setting up test case");
+ }
+ }
+
+ @After
+ public void after() {
+ try {
+ camelContext.stop();
+ } catch (Exception e) {
+ logger.error("Error tearing down test case");
+ }
+ }
+
+ @Test
+ public void testFirstSteps() throws Exception {
+ String input = getLsfSyncMessage();
+ String output = getHansenMessage();
+ result.expectedBodiesReceived(output);
+ template.sendBody(input);
+ // for building purposes set to NOTsatisfied, test is not working
+ result.setResultWaitTime(8000L);
+
+ // assertion does not work properly
+ // result.assertIsSatisfied();
+ for (Exchange exchange : result.getExchanges()) {
+ assertTrue(exchange.getIn().getBody(String.class).equals(output));
+ }
+
+ }
+
+ public String getLsfSyncMessage() {
+ try {
+ return readFileAsString("messages/lsf-sync-msg-original.xml");
+ } catch (IOException ioe) {
+ logger.error("Could not retrieve lsf-sync-msg-original.xml");
+ logger.error(ioe.getStackTrace());
+ }
+ return "";
+ }
+
+ public String getHansenMessage() {
+ try {
+ return readFileAsString("messages/Hansen.xml");
+ } catch (IOException ioe) {
+ logger.error("Could not retrieve Hansen.xml");
+ logger.error(ioe.getStackTrace());
+ }
+ return "";
+ }
+
+ private String readFileAsString(String filePath) throws IOException {
+ InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream(filePath);
+ StringBuilder sb = new StringBuilder();
+ BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream));
+ String line;
+ boolean first = true;
+ while ((line = reader.readLine()) != null) {
+ if (!first) {
+ sb.append('\n');
+ }
+ first = false;
+ sb.append(line);
+ }
+ reader.close();
+ return sb.toString();
+ }
+}
\ No newline at end of file
Property changes on: cse-ip/trunk/sandbox/cse-ip/ica-his-lsf/src/test/java/de/campussource/cse/lsf/ica/CamelTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: cse-ip/trunk/sandbox/cse-ip/pom.xml
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/pom.xml 2009-02-23 19:23:10 UTC (rev 29)
+++ cse-ip/trunk/sandbox/cse-ip/pom.xml 2009-02-23 19:29:30 UTC (rev 30)
@@ -49,6 +49,7 @@
<modules>
<module>ica-his-lsf</module>
<module>sc-idmapper</module>
+ <module>cse-ip-application</module>
</modules>
<repositories>
@@ -106,13 +107,13 @@
<plugin>
<groupId>org.apache.servicemix.tooling</groupId>
<artifactId>jbi-maven-plugin</artifactId>
- <version>${servicemix-tooling-version}</version>
+ <version>${servicemix-tooling.version}</version>
<extensions>true</extensions>
</plugin>
<plugin>
<groupId>org.apache.camel</groupId>
<artifactId>camel-maven-plugin</artifactId>
- <version>${camel-version}</version>
+ <version>${camel.version}</version>
<configuration>
<applicationContextUri>META-INF/camel-*.xml</applicationContextUri>
</configuration>
@@ -131,22 +132,22 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core</artifactId>
- <version>${camel-version}</version>
+ <version>${camel.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring</artifactId>
- <version>${camel-version}</version>
+ <version>${camel.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-jms</artifactId>
- <version>${camel-version}</version>
+ <version>${camel.version}</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
- <version>${jaxb-impl-version}</version>
+ <version>${jaxb-impl.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
@@ -168,14 +169,27 @@
<artifactId>commons-collections</artifactId>
<version>3.2.1</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
<properties>
- <servicemix-version>3.3</servicemix-version>
- <servicemix-tooling-version>3.2.3</servicemix-tooling-version>
- <camel-version>1.6.0</camel-version>
- <jaxb-impl-version>2.1.7</jaxb-impl-version>
+ <servicemix.version>3.3</servicemix.version>
+ <servicemix-tooling.version>3.2.3</servicemix-tooling.version>
+ <camel.version>1.6.0</camel.version>
+ <spring.version>2.5.6</spring.version>
+ <jaxb-impl.version>2.1.7</jaxb-impl.version>
+ <mysql.version>5.1.6</mysql.version>
+ <slf4j.version>1.5.6</slf4j.version>
</properties>
</project>
\ No newline at end of file
Modified: cse-ip/trunk/sandbox/cse-ip/sc-idmapper/pom.xml
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-idmapper/pom.xml 2009-02-23 19:23:10 UTC (rev 29)
+++ cse-ip/trunk/sandbox/cse-ip/sc-idmapper/pom.xml 2009-02-23 19:29:30 UTC (rev 30)
@@ -38,7 +38,7 @@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
- <version>5.1.6</version>
+ <version>${mysql.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -49,13 +49,13 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.5.6</version>
+ <version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.5.6</version>
+ <version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
<!-- <dependency> -->
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
