Browse files

Update project to use H2 Database and deploy it on Fuse ESB 4.4.1 usi…

…ng Camel 2.8
  • Loading branch information...
1 parent 7de47d4 commit 7f3aefa94d6e06f80755d73fae5fdad373fbbb79 @cmoulliard committed Nov 7, 2011
View
11 .gitignore
@@ -0,0 +1,11 @@
+target
+*.iml
+*.ipr
+*.iws
+overlays
+.DS_Store
+.settings
+bin
+*.swp
+*.log
+
View
114 README
@@ -11,47 +11,83 @@ Remark : This example does not longer use Hibernate but OpenJPA
COMPILING
=========
-mvn clean install
+ mvn clean install
+
+H2 DATABASE
+===========
+
+ STEP 1 : Open a DOS/UNIX console in the folder persistence/database
+
+ STEP 2 : Download H2 Database (http://www.h2database.com/html/download.html) and install it
+
+ STEP 3 : Start H2 Server using the bat or shell script
+
+ ./h2.sh &
+
+ The H2 server is started and to manage the databases from your web browser, simply click on the following url http://192.168.1.2:8082/
+
+ STEP 4 : Next create the report database
+
+ In the login.jsp screen, select Generic (H2) - Server
+ Add as settings name : Generic H2 (Server) - Webinar
+ and modify the JDBC ur las such : jdbc:h2:tcp://localhost/~/reportdb
+
+ Next click on "connect" and the screen to manage the reportdb appears
+
+ STEP 5 : Create Schema and Tables using the script located in the file reportincident.db/src/main/config/h2-script.sql
+
+ Execute the scripts 1), 2) and 3) defined in this file
+
+ Check that the records are well created using the command : SELECT * FROM REPORT.T_INCIDENT;
DEPLOYING
=========
-1) Download Fuse ESB Server from this repository : http://repo.fusesource.com/nexus/content/repositories/releases/org/apache/servicemix/apache-servicemix/4.3.1-fuse-01-09/
-2) Unzip the zip or tar.gz archive
-3) Open in a DOS windows or Unix terminal the directory bin
-4) Start ServiceMix servicemix.bat or ./servicemix
-5) In the servicemix console, launch the commands to install features of reportincident demo
-
-features:addUrl mvn:org.apache.camel.example.reportincident/features/1.0-SNAPSHOT/xml/features
-features:install reportincident-jpa
-
-3) Check if the project works fine and connect to the following url in your browser
-http://localhost:8282/cxf/camel-example/incident?wsdl
-
-4) Verify of the web site is operational
-http://localhost:8181/reportincidentweb/
-
-5) Copy incident file
-cp /Users/charlesmoulliard/wks-projects/tutorial-osgi-camel-part2/reportincident.routing/src/data/csv-one-record.txt /Users/charlesmoulliard/Applications/apache-servicemix-4.3.1-fuse-01-09/data/reportincident/
-
-6) Use SOAPUi client and send this envelope to the server
-SOAP Enveloppe
-**************
-<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:rep="http://reportincident.example.camel.apache.org">
- <soapenv:Header/>
- <soapenv:Body>
- <rep:inputReportIncident>
- <incidentId>999</incidentId>
- <incidentDate>10-05-2011</incidentDate>
- <givenName>Charles</givenName>
- <familyName>Moulliard</familyName>
- <summary>Probleme au parisjug</summary>
- <details>La salle est en feu !</details>
- <email>cmoulliard@fusesource.com</email>
- <phone>+32473604014</phone>
- </rep:inputReportIncident>
- </soapenv:Body>
-</soapenv:Envelope>
-
-7) Enjoy this demo
+
+ STEP 1 : Download Fuse ESB Server from this repository : http://repo.fusesource.com/nexus/content/repositories/releases/org/apache/servicemix/apache-servicemix/4.4.1-fuse-01-06/
+ STEP 2 : Unzip the zip or tar.gz archive
+ STEP 3 : Open in a DOS windows or Unix terminal the directory bin
+ STEP 4 : Edit the file /etc/org.apache.karaf.features.cfg and add the following features to boot
+
+ featuresBoot=karaf-framework,config,war,activemq-broker,activemq-spring,camel,camel-cxf,camel-activemq,camel-nmr,camel-jaxb,camel-bindy,jpa
+
+ STEP 5 : Start ServiceMix servicemix.bat or ./servicemix
+ STEP 6 : In the servicemix console, launch the commands to install features of reportincident demo
+
+ features:addUrl mvn:org.apache.camel.example.reportincident/features/1.0-SNAPSHOT/xml/features
+ features:install reportincident-jpa
+
+ STEP 7 : Check if the project works fine and connect to the following url in your browser
+
+ http://localhost:8282/cxf/camel-example/incident?wsdl
+
+ STEP 8 : Verify of the web site is operational
+
+ http://localhost:8181/reportincidentweb/
+
+ STEP 9 : Copy incident file
+ cp ~/wks-projects/tutorial-osgi-camel-part2/reportincident.routing/src/data/csv-one-record.txt /Fuse/servers/apache-servicemix-4.4.1-fuse-01-06-devoxx/data/reportincident/
+
+ STEP 10 : Use SOAPUi client and send this envelope to the server
+
+ SOAP Enveloppe
+ **************
+ <soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:rep="http://reportincident.example.camel.apache.org">
+ <soapenv:Header/>
+ <soapenv:Body>
+ <rep:inputReportIncident>
+ <incidentId>999</incidentId>
+ <incidentDate>10-05-2011</incidentDate>
+ <givenName>Charles</givenName>
+ <familyName>Moulliard</familyName>
+ <summary>Issue at the DevoXX</summary>
+ <details>Room is burning !</details>
+ <email>cmoulliard@fusesource.com</email>
+ <phone>+32473604014</phone>
+ </rep:inputReportIncident>
+ </soapenv:Body>
+ </soapenv:Envelope>
+
+
+!!! Enjoy this DevoXX demo !!!
View
23 pom.xml
@@ -21,7 +21,7 @@
<artifactId>reportincident.parent</artifactId>
<packaging>pom</packaging>
<version>1.0-SNAPSHOT</version>
- <name>Reportincident :: Parent pom</name>
+ <name>Reportincident :: Parent POM</name>
<modules>
<module>reportincident.features</module>
@@ -35,28 +35,30 @@
</modules>
<properties>
- <activemq-version>5.4.2-fuse-03-09</activemq-version>
+ <activemq-version>5.5.1-fuse-01-06</activemq-version>
<aries-version>0.3</aries-version>
<asm-version>1.5.3</asm-version>
<build-helper-maven-plugin.version>1.5</build-helper-maven-plugin.version>
- <camel-version>2.6.0-fuse-01-09</camel-version>
+ <camel-version>2.8.0-fuse-01-06 </camel-version>
<commons-dbcp-version>1.4</commons-dbcp-version>
<commons-lang>2.4</commons-lang>
<commons-logging-version>1.1.1</commons-logging-version>
<derby-version>10.6.2.1</derby-version>
- <cxf-version>2.3.3-fuse-01-09</cxf-version>
+ <cxf-version>2.4.3-fuse-00-06</cxf-version>
<felix-version>2.0.1</felix-version>
<felix-osgi-version>1.2.0</felix-osgi-version>
<geronimo_jpa_spec-version>1.1.1</geronimo_jpa_spec-version>
<hibernate-version>3.3.1.GA</hibernate-version>
<hsqldb-version>1.8.0.10</hsqldb-version>
+ <h2-version>1.3.160</h2-version>
<jetty-version>6.1.22</jetty-version>
<jta-version>1.0.1B</jta-version>
<junit-version>4.4</junit-version>
+ <karaf-version>2.2.2.fuse-02-06</karaf-version>
<log4j-version>1.2.14</log4j-version>
<mysql-version>5.1.6</mysql-version>
- <openjpa-version>2.0.1</openjpa-version>
- <servicemix-version>4.3.1-fuse-01-09</servicemix-version>
+ <openjpa-version>2.1.0</openjpa-version>
+ <servicemix-version>4.4.1-fuse-01-06</servicemix-version>
<spring-osgi-version>1.2.0</spring-osgi-version>
<spring-version>3.0.5.RELEASE</spring-version>
<wicket-version>1.4.7</wicket-version>
@@ -107,6 +109,15 @@
<url>http://repo.fusesource.com/nexus/content/repositories/releases/</url>
</repository>
</repositories>
+
+ <pluginRepositories>
+ <pluginRepository>
+ <id>FuseSource-release</id>
+ <releases><enabled>true</enabled></releases>
+ <snapshots><enabled>false</enabled></snapshots>
+ <url>http://repo.fusesource.com/nexus/content/repositories/releases/</url>
+ </pluginRepository>
+ </pluginRepositories>
</project>
View
46 reportincident.db/src/main/config/h2-script.sql
@@ -0,0 +1,46 @@
+SCRIPTS TO BE USED TO SETUP REPORT_INCIDENT with H2 database
+
+1) CREATE REPORT SCHEMA
+************************
+
+CREATE SCHEMA REPORT;
+
+2) CREATE TABLES FOR REPORT SCHEMAS
+***********************************
+
+CREATE TABLE REPORT.OPENJPA_SEQUENCE_TABLE (
+ ID BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 1) NOT NULL PRIMARY KEY,
+ SEQUENCE_VALUE BIGINT NOT NULL
+);
+
+
+CREATE TABLE REPORT.T_INCIDENT (
+ INCIDENT_ID BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 1) NOT NULL PRIMARY KEY,
+ INCIDENT_REF VARCHAR(55),
+ INCIDENT_DATE TIMESTAMP,
+ GIVEN_NAME VARCHAR(35),
+ FAMILY_NAME VARCHAR(35),
+ SUMMARY VARCHAR(35),
+ DETAILS VARCHAR(255),
+ EMAIL VARCHAR(60),
+ PHONE VARCHAR(35),
+ CREATION_DATE TIMESTAMP,
+ CREATION_USER VARCHAR(255)
+);
+
+
+3) INSERT RECORDS
+*****************
+INSERT INTO REPORT.T_INCIDENT (INCIDENT_REF, INCIDENT_DATE,GIVEN_NAME,FAMILY_NAME,SUMMARY,DETAILS,EMAIL,PHONE) VALUES ('001','2011-03-21','Charles','Moulliard','Incident Webinar-001','This is a report incident for webinar-001','cmoulliard@fusesource.com','+111 10 20 300');
+INSERT INTO REPORT.T_INCIDENT (INCIDENT_REF, INCIDENT_DATE,GIVEN_NAME,FAMILY_NAME,SUMMARY,DETAILS,EMAIL,PHONE) VALUES ('002','2011-03-22','Charles','Moulliard','Incident Webinar-002','This is a report incident for webinar-002','cmoulliard@fusesource.com','+111 10 20 300');
+INSERT INTO REPORT.T_INCIDENT (INCIDENT_REF, INCIDENT_DATE,GIVEN_NAME,FAMILY_NAME,SUMMARY,DETAILS,EMAIL,PHONE) VALUES ('003','2011-03-23','Charles','Moulliard','Incident Webinar-003','This is a report incident for webinar-003','cmoulliard@fusesource.com','+111 10 20 300');
+INSERT INTO REPORT.T_INCIDENT (INCIDENT_REF, INCIDENT_DATE,GIVEN_NAME,FAMILY_NAME,SUMMARY,DETAILS,EMAIL,PHONE) VALUES ('004','2011-03-24','Charles','Moulliard','Incident Webinar-004','This is a report incident for webinar-004','cmoulliard@fusesource.com','+111 10 20 300');
+
+
+6) Useful scripts
+******************
+DELETE FROM REPORT.T_INCIDENT;
+
+SELECT * FROM REPORT.T_INCIDENT;
+
+DROP SCHEMA REPORT;
View
97 reportincident.features/src/main/resources/reportincident.xml
@@ -16,49 +16,75 @@
limitations under the License.
-->
<features>
-
- <feature name="reportincident" version="${pom.version}">
- <!-- <bundle>mvn:org.apache.camel.example/reportincident-activemq/${pom.version}</bundle>
- <bundle>mvn:org.apache.camel.example/reportincident-queueservice/${pom.version}</bundle>-->
+
+ <feature name="reportincident-jpa" version="${project.version}">
<feature version='${camel-version}'>camel-bindy</feature>
<feature version='${camel-version}'>camel-cxf</feature>
<feature version='${servicemix-version}'>camel-activemq</feature>
<feature version='${wicket-version}'>wicket</feature>
- <feature version='${derby-version}'>jdbc-driver-derby</feature>
+ <feature>jdbc-driver-h2</feature>
<feature version='${spring-version}'>spring-persistence</feature>
- <feature version='${aries-version}'>aries</feature>
- <feature>hibernate</feature>
- <feature>spring-web</feature>
- <bundle>mvn:org.apache.camel.example.reportincident/model/${pom.version}</bundle>
- <bundle>mvn:org.apache.camel.example.reportincident/persistence/${pom.version}</bundle>
- <bundle>mvn:org.apache.camel.example.reportincident/service/${pom.version}</bundle>
- <bundle>mvn:org.apache.camel.example.reportincident/webservice/${pom.version}</bundle>
- <bundle>mvn:org.apache.camel.example.reportincident/routing/${pom.version}</bundle>
- <bundle>mvn:org.apache.camel.example.reportincident/web/${pom.version}/war</bundle>
+ <feature version='${openjpa-version}'>openjpa</feature>
+ <feature>spring-dm-web</feature>
+ <bundle>mvn:org.apache.camel.example.reportincident/persistence-jpa/${project.version}</bundle>
+ <bundle>mvn:org.apache.camel.example.reportincident/service/${project.version}</bundle>
+ <bundle>mvn:org.apache.camel.example.reportincident/webservice/${project.version}</bundle>
+ <bundle>mvn:org.apache.camel.example.reportincident/routing/${project.version}</bundle>
+ <bundle>mvn:org.apache.camel.example.reportincident/web/${project.version}/war</bundle>
</feature>
- <feature name="reportincident-jpa" version="${pom.version}">
+ <!--
+ <feature name="spring-web">
+ <feature version='${spring-osgi-version}'>spring-dm</feature>
+ <bundle>mvn:org.springframework/spring-web/${spring-version}</bundle>
+ <bundle>mvn:org.springframework.osgi/spring-osgi-web/${spring-osgi-version}</bundle>
+ </feature>
+ -->
+ <feature name="spring-persistence" version="${spring-version}">
+ <bundle>mvn:org.springframework/spring-orm/${spring-version}</bundle>
+ <bundle>mvn:org.springframework/spring-jdbc/${spring-version}</bundle>
+ <bundle>mvn:org.springframework/spring-aspects/${spring-version}</bundle>
+ </feature>
+
+ <feature name="openjpa" version="${openjpa-version}">
+ <bundle>mvn:org.apache.geronimo.specs/geronimo-jpa_2.0_spec/1.1</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.serp/1.13.1_2</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/1.4_1</bundle>
+ <bundle>mvn:org.apache.openjpa/openjpa/${openjpa-version}</bundle>
+ </feature>
+
+ <feature name="jdbc-driver-h2" version="${h2-version}">
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/1.4_1</bundle>
+ <bundle>mvn:com.h2database/h2/${h2-version}</bundle>
+ </feature>
+
+ <feature name="wicket" version="${wicket-version}">
+ <bundle>mvn:org.apache.wicket/wicket/${wicket-version}</bundle>
+ <bundle>mvn:org.apache.wicket/wicket-ioc/${wicket-version}</bundle>
+ <bundle>mvn:org.apache.wicket/wicket-spring/${wicket-version}</bundle>
+ <bundle>mvn:org.apache.wicket/wicket-extensions/${wicket-version}</bundle>
+ </feature>
+
+ <!--
+
+ <feature name="reportincident" version="${pom.version}">
<feature version='${camel-version}'>camel-bindy</feature>
<feature version='${camel-version}'>camel-cxf</feature>
<feature version='${servicemix-version}'>camel-activemq</feature>
<feature version='${wicket-version}'>wicket</feature>
- <feature>jdbc-driver-hsqldb</feature>
+ <feature version='${derby-version}'>jdbc-driver-derby</feature>
<feature version='${spring-version}'>spring-persistence</feature>
- <feature version='${openjpa-version}'>openjpa</feature>
+ <feature version='${aries-version}'>aries</feature>
+ <feature>hibernate</feature>
<feature>spring-web</feature>
- <bundle>mvn:org.apache.camel.example.reportincident/persistence-jpa/${pom.version}</bundle>
+ <bundle>mvn:org.apache.camel.example.reportincident/model/${pom.version}</bundle>
+ <bundle>mvn:org.apache.camel.example.reportincident/persistence/${pom.version}</bundle>
<bundle>mvn:org.apache.camel.example.reportincident/service/${pom.version}</bundle>
<bundle>mvn:org.apache.camel.example.reportincident/webservice/${pom.version}</bundle>
<bundle>mvn:org.apache.camel.example.reportincident/routing/${pom.version}</bundle>
<bundle>mvn:org.apache.camel.example.reportincident/web/${pom.version}/war</bundle>
</feature>
-
- <feature name="spring-web">
- <feature version='${spring-osgi-version}'>spring-dm</feature>
- <bundle>mvn:org.springframework/spring-web/${spring-version}</bundle>
- <bundle>mvn:org.springframework.osgi/spring-osgi-web/${spring-osgi-version}</bundle>
- </feature>
-
+
<feature name="hibernate">
<bundle>mvn:org.springframework/spring-orm/${spring-version}</bundle>
<bundle>mvn:org.springframework/spring-jdbc/${spring-version}</bundle>
@@ -69,25 +95,19 @@
<bundle>mvn:org.hibernate/com.springsource.org.hibernate/3.3.1.GA</bundle>
</feature>
- <feature name="spring-persistence" version="${spring-version}">
- <bundle>mvn:org.springframework/spring-orm/${spring-version}</bundle>
- <bundle>mvn:org.springframework/spring-jdbc/${spring-version}</bundle>
- <bundle>mvn:org.springframework/spring-aspects/${spring-version}</bundle>
- </feature>
-
<feature name="openjpa" version="${openjpa-version}">
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aspectj/1.6.8_1</bundle>
<bundle>mvn:org.apache.openjpa/openjpa/${openjpa-version}</bundle>
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.java-persistence-api-2.0/1.6.0</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.serp/1.13.1_2</bundle>
</feature>
-
+
<feature name="jdbc-driver-mysql">
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/1.4_1-SNAPSHOT</bundle>
<bundle>mvn:mysql/mysql-connector-java/5.1.9</bundle>
</feature>
- <feature name="jdbc-driver-hsqldb" version="${hsqldb-version}">
+ <feature name="jdbc-driver-hsqldb" version="${hsqldb-version}">
<bundle>mvn:commons-pool/commons-pool/1.5.5</bundle>
<bundle>mvn:commons-dbcp/commons-dbcp/1.4</bundle>
<bundle>wrap:mvn:org.hsqldb/hsqldb/${hsqldb-version}</bundle>
@@ -97,13 +117,6 @@
<bundle>mvn:commons-dbcp/commons-dbcp/1.4</bundle>
<bundle>mvn:org.apache.derby/derby/${derby-version}</bundle>
</feature>
-
- <feature name="wicket" version="${wicket-version}">
- <bundle>mvn:org.apache.wicket/wicket/${wicket-version}</bundle>
- <bundle>mvn:org.apache.wicket/wicket-ioc/${wicket-version}</bundle>
- <bundle>mvn:org.apache.wicket/wicket-spring/${wicket-version}</bundle>
- <bundle>mvn:org.apache.wicket/wicket-extensions/${wicket-version}</bundle>
- </feature>
<feature name="aries" version="${aries-version}">
<bundle>mvn:org.apache.aries.jpa/org.apache.aries.jpa.blueprint.aries/${aries-version}</bundle>
@@ -113,4 +126,8 @@
<bundle>mvn:org.apache.aries.jpa/org.apache.aries.jpa.container.context/${aries-version}</bundle>
<bundle>mvn:org.apache.aries.jndi/org.apache.aries.jndi/${aries-version}</bundle>
</feature>
+
+ -->
+
+
</features>
View
41 reportincident.persistence-jpa/META-INF/MANIFEST.MF
@@ -5,37 +5,38 @@ Export-Package: org.apache.camel.example.reportincident.model;uses:="o
stence",org.apache.camel.example.reportincident.dao;uses:="org.apache
.camel.example.reportincident.model"
Built-By: charlesmoulliard
+Build-Jdk: 1.6.0_26
+Bundle-Version: 1.0.0.SNAPSHOT
Tool: Bnd-0.0.357
Bundle-Name: Reportincident :: Persistence JPA
+Bnd-LastModified: 1320680619539
Created-By: Apache Maven Bundle Plugin
-DynamicImport-Package: *
-Build-Jdk: 1.6.0_24
-Bundle-Version: 1.0.0.SNAPSHOT
-Bnd-LastModified: 1305016877675
Bundle-ManifestVersion: 2
+Bundle-SymbolicName: persistence-jpa
Import-Package: javax.persistence;resolution:=optional;version="[1.1.0
,2.1.0)",javax.persistence.criteria;resolution:=optional;version="[1.
1.0,2.1.0)",javax.persistence.metamodel;resolution:=optional;version=
"[1.1.0,2.1.0)",javax.persistence.spi;resolution:=optional;version="[
1.1.0,2.1.0)",javax.sql;resolution:=optional,javax.transaction;resolu
tion:=optional,org.aopalliance.aop;resolution:=optional,org.apache.ca
- mel.dataformat.bindy.annotation;version="2.6",org.apache.camel.exampl
+ mel.dataformat.bindy.annotation;version="2.8",org.apache.camel.exampl
e.reportincident.dao,org.apache.camel.example.reportincident.model,or
g.apache.commons.dbcp;resolution:=optional;version="[1.2,1.5)",org.ap
ache.commons.lang.builder;version="2.4",org.apache.commons.logging,or
- g.apache.log4j,org.apache.openjpa.enhance,org.apache.openjpa.util,org
- .aspectj.lang;resolution:=optional,org.hsqldb,org.springframework.aop
- ;resolution:=optional;version="[2.5,4.0)",org.springframework.aop.fra
- mework;resolution:=optional;version="[2.5,4.0)",org.springframework.c
- ontext.weaving;resolution:=optional;version="[2.5,4.0)",org.springfra
- mework.instrument.classloading;resolution:=optional;version="[2.5,4.0
- )",org.springframework.orm;resolution:=optional;version="[2.5,4.0)",o
- rg.springframework.orm.jpa;resolution:=optional;version="[2.5,4.0)",o
- rg.springframework.orm.jpa.support;resolution:=optional;version="[2.5
- ,4.0)",org.springframework.orm.jpa.vendor;resolution:=optional;versio
- n="[2.5,4.0)",org.springframework.transaction;resolution:=optional;ve
- rsion="[2.5,4.0)",org.springframework.transaction.aspectj;resolution:
- =optional;version="[2.5,4.0)",org.springframework.transaction.support
- ;resolution:=optional;version="[2.5,4.0)",serp.util
-Bundle-SymbolicName: persistence-jpa
+ g.apache.log4j,org.apache.openjpa.enhance,org.apache.openjpa.persiste
+ nce,org.apache.openjpa.persistence.query,org.apache.openjpa.util,org.
+ aspectj.lang;resolution:=optional,org.h2;resolution:=optional;version
+ ="1.3",org.hsqldb;resolution:=optional,org.springframework.aop;resolu
+ tion:=optional;version="[2.5,4.0)",org.springframework.aop.framework;
+ resolution:=optional;version="[2.5,4.0)",org.springframework.context.
+ weaving;resolution:=optional;version="[2.5,4.0)",org.springframework.
+ instrument.classloading;resolution:=optional;version="[2.5,4.0)",org.
+ springframework.orm;resolution:=optional;version="[2.5,4.0)",org.spri
+ ngframework.orm.jpa;resolution:=optional;version="[2.5,4.0)",org.spri
+ ngframework.orm.jpa.support;resolution:=optional;version="[2.5,4.0)",
+ org.springframework.orm.jpa.vendor;resolution:=optional;version="[2.5
+ ,4.0)",org.springframework.transaction;resolution:=optional;version="
+ [2.5,4.0)",org.springframework.transaction.aspectj;resolution:=option
+ al;version="[2.5,4.0)",org.springframework.transaction.support;resolu
+ tion:=optional;version="[2.5,4.0)",serp.util
View
26 reportincident.persistence-jpa/pom.xml
@@ -51,7 +51,12 @@
<artifactId>hsqldb</artifactId>
<version>${hsqldb-version}</version>
</dependency>
- <dependency>
+ <dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ <version>${h2-version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-bindy</artifactId>
<version>${camel-version}</version>
@@ -61,6 +66,11 @@
<artifactId>commons-lang</artifactId>
<version>${commons-lang}</version>
</dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>${commons-logging-version}</version>
+ </dependency>
</dependencies>
<repositories>
@@ -96,13 +106,20 @@
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Import-Package>
org.apache.camel.example.reportincident.model,
- org.hsqldb,
+ org.hsqldb;resolution:=optional,
+ org.h2;resolution:=optional,
serp.util,
org.apache.log4j,
+ org.apache.camel.dataformat.bindy.annotation,
+ org.apache.commons.lang.builder,
org.apache.commons.logging,
org.apache.commons.dbcp;resolution:=optional;version="[1.2,1.5)",
org.aspectj.lang;resolution:=optional,
org.aopalliance.aop;resolution:=optional,
+ org.apache.openjpa.enhance,
+ org.apache.openjpa.persistence,
+ org.apache.openjpa.persistence.query,
+ org.apache.openjpa.util,
org.springframework.aop;resolution:=optional;version="[2.5,4.0)",
org.springframework.aop.framework;resolution:=optional;version="[2.5,4.0)",
org.springframework.instrument.classloading;resolution:=optional;version="[2.5,4.0)",
@@ -120,18 +137,17 @@
javax.persistence.spi;resolution:=optional;version="[1.1.0,2.1.0)",
javax.sql;resolution:=optional,
javax.transaction;resolution:=optional,
- *
+ *
</Import-Package>
<Private-Package>org.apache.camel.example.reportincident.dao.impl</Private-Package>
<Export-Package>
org.apache.camel.example.reportincident.model,
org.apache.camel.example.reportincident.dao
</Export-Package>
- <DynamicImport-Package>*</DynamicImport-Package>
+ <DynamicImport-Package></DynamicImport-Package>
</instructions>
</configuration>
</plugin>
- <!-- com.mysql.jdbc, -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
View
8 ...e-jpa/src/main/java/org/apache/camel/example/reportincident/dao/impl/IncidentDAOImpl.java
@@ -25,9 +25,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-public class IncidentDAOImpl
- implements IncidentDAO
-{
+public class IncidentDAOImpl implements IncidentDAO {
+
private static final transient Log LOG = LogFactory.getLog(IncidentDAOImpl.class);
@PersistenceContext
@@ -65,8 +64,7 @@ public void removeIncident(long id)
this.em.flush();
}
- public void saveIncident(Incident incident)
- {
+ public void saveIncident(Incident incident) {
this.em.persist(incident);
this.em.flush();
}
View
16 ...persistence-jpa/src/main/java/org/apache/camel/example/reportincident/model/Incident.java
@@ -27,44 +27,46 @@
@CsvRecord(separator = ",")
@Entity
-public class Incident extends org.apache.camel.example.reportincident.model.Abstract implements Serializable {
+@Table(name = "T_INCIDENT")
+public class Incident extends Abstract implements Serializable {
private static final long serialVersionUID = 1L;
- @Column(name = "INCIDENT_REF")
+ @Column(name = "INCIDENT_REF", length = 55)
@DataField(pos = 1)
private String incidentRef;
@Column(name = "INCIDENT_DATE")
@DataField(pos = 2, pattern = "dd-mm-yyyy")
private Date incidentDate;
- @Column(name = "GIVEN_NAME")
+ @Column(name = "GIVEN_NAME", length = 35)
@DataField(pos = 3)
private String givenName;
- @Column(name = "FAMILY_NAME")
+ @Column(name = "FAMILY_NAME", length = 35)
@DataField(pos = 4)
private String familyName;
- @Column(name = "SUMMARY")
+ @Column(name = "SUMMARY", length = 35)
@DataField(pos = 5)
private String summary;
@Column(name = "DETAILS")
@DataField(pos = 6)
private String details;
- @Column(name = "EMAIL")
+ @Column(name = "EMAIL", length = 60)
@DataField(pos = 7)
private String email;
- @Column(name = "PHONE")
+ @Column(name = "PHONE", length = 35)
@DataField(pos = 8)
private String phone;
@Id
@GeneratedValue(strategy=GenerationType.AUTO)
+ @Column(name = "INCIDENT_ID")
private long incidentId;
@Column(name = "CREATION_USER")
View
18 reportincident.persistence-jpa/src/main/resources/META-INF/persistence.xml
@@ -5,12 +5,22 @@
version="2.0">
<persistence-unit name="reportIncident" transaction-type="RESOURCE_LOCAL">
+
+ <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
+
<class>org.apache.camel.example.reportincident.model.Incident</class>
- <exclude-unlisted-classes>true</exclude-unlisted-classes>
+
+ <exclude-unlisted-classes>true</exclude-unlisted-classes>
+
<properties>
- <property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(SchemaAction='add,deleteTableContents')"/>
- <!-- <property name="openjpa.Log" value="log4j"/> -->
- <property name="openjpa.Log" value="commons" />
+ <property name="openjpa.jdbc.SynchronizeMappings"
+ value="buildSchema(SchemaAction='add,deleteTableContents')"/>
+ <property name="openjpa.Log"
+ value="DefaultLevel=TRACE, Runtime=INFO, Tool=INFO, SQL=TRACE"/>
+ <property name="openjpa.jdbc.DBDictionary"
+ value="h2(useSchemaName=true)"/>
+ <property name="openjpa.jdbc.Schema"
+ value="REPORT"/>
</properties>
</persistence-unit>
View
104 reportincident.persistence-jpa/src/main/resources/META-INF/spring/persistence-dao.xml
@@ -15,12 +15,12 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans"
+<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:context="http://www.springframework.org/schema/context"
xmlns:osgi="http://www.springframework.org/schema/osgi"
xmlns:osgix="http://www.springframework.org/schema/osgi-compendium"
- xsi:schemaLocation="
+ xsi:schemaLocation="
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context
@@ -30,29 +30,28 @@
http://www.springframework.org/schema/osgi-compendium
http://www.springframework.org/schema/osgi-compendium/spring-osgi-compendium.xsd">
- <!--
- Activates various annotations to be detected in bean classes: Spring's
- @Required and @Autowired, as well as JSR 250's @PostConstruct,
- @PreDestroy and @Resource (if available) and JPA's @PersistenceContext
- and @PersistenceUnit (if available).
- -->
- <context:annotation-config/>
+ <!--
+ Activates various annotations to be detected in bean classes: Spring's
+ @Required and @Autowired, as well as JSR 250's @PostConstruct,
+ @PreDestroy and @Resource (if available) and JPA's @PersistenceContext
+ and @PersistenceUnit (if available).
+ -->
+ <context:annotation-config/>
- <!-- enables interpretation of the @PersistenceUnit/@PersistenceContext annotations providing convenient
- access to EntityManagerFactory/EntityManager -->
- <bean class="org.springframework.orm.jpa.support.PersistenceAnnotationBeanPostProcessor"/>
+ <!-- enables interpretation of the @PersistenceUnit/@PersistenceContext annotations providing convenient
+ access to EntityManagerFactory/EntityManager -->
+ <bean class="org.springframework.orm.jpa.support.PersistenceAnnotationBeanPostProcessor"/>
- <!-- DAO Declarations -->
- <bean id="incidentDAO" class="org.apache.camel.example.reportincident.dao.impl.IncidentDAOImpl"/>
+ <!-- DAO Declarations -->
+ <bean id="incidentDAO" class="org.apache.camel.example.reportincident.dao.impl.IncidentDAOImpl"/>
<!-- Expose DAO interface as OSGI Service -->
<osgi:service ref="incidentDAO" interface="org.apache.camel.example.reportincident.dao.IncidentDAO"/>
<bean id="entityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
<property name="persistenceUnitName" value="reportIncident"/>
- <property name="jpaVendorAdapter" ref="jpaAdapterHSQL" />
- <property name="dataSource" ref="dataSourceHSQL"/>
-
+ <property name="jpaVendorAdapter" ref="jpaAdapterH2"/>
+ <property name="dataSource" ref="dataSourceH2"/>
</bean>
<!--
@@ -75,12 +74,19 @@
</bean>
-->
- <!-- OpenJPA HSQL addapter -->
- <bean id="jpaAdapterHSQL" class="org.springframework.orm.jpa.vendor.OpenJpaVendorAdapter">
- <property name="databasePlatform" value="org.apache.openjpa.jdbc.sql.HSQLDictionary" />
- <property name="database" value="HSQL" />
- <property name="showSql" value="true" />
- </bean>
+ <!-- OpenJPA HSQL addapter
+ <bean id="jpaAdapterHSQL" class="org.springframework.orm.jpa.vendor.OpenJpaVendorAdapter">
+ <property name="databasePlatform" value="org.apache.openjpa.jdbc.sql.HSQLDictionary"/>
+ <property name="database" value="HSQL"/>
+ <property name="showSql" value="true"/>
+ </bean>
+ -->
+
+ <bean id="jpaAdapterH2" class="org.springframework.orm.jpa.vendor.OpenJpaVendorAdapter">
+ <property name="databasePlatform" value="org.apache.openjpa.jdbc.sql.H2Dictionary"/>
+ <property name="database" value="H2"/>
+ <property name="showSql" value="true"/>
+ </bean>
<!-- DataSource MYSQL
@@ -93,31 +99,39 @@
</bean>
-->
- <!-- DataSource Derby
- <bean id="dataSourceDERBY" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
- <property name="driverClassName" value="org.apache.derby.jdbc.EmbeddedDriver" />
- <property name="url" value="jdbc:derby:/temp/reportincident;create=true" />
- <property name="username" value="" />
- <property name="password" value="" />
- </bean>
- -->
+ <!-- DataSource Derby
+ <bean id="dataSourceDERBY" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
+ <property name="driverClassName" value="org.apache.derby.jdbc.EmbeddedDriver" />
+ <property name="url" value="jdbc:derby:/temp/reportincident;create=true" />
+ <property name="username" value="" />
+ <property name="password" value="" />
+ </bean>
+ -->
+
+ <!-- DataSource HSQL
+ <bean id="dataSourceHSQL" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
+ <property name="driverClassName" value="org.hsqldb.jdbcDriver"/>
+ <property name="url" value="jdbc:hsqldb:mem:reportincident"/>
+ <property name="username" value="sa"/>
+ <property name="password" value=""/>
+ </bean>
+ -->
- <!-- DataSource HSQL -->
- <bean id="dataSourceHSQL" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
- <property name="driverClassName" value="org.hsqldb.jdbcDriver" />
- <property name="url" value="jdbc:hsqldb:mem:reportincident" />
- <property name="username" value="sa" />
- <property name="password" value="" />
- </bean>
+ <bean id="dataSourceH2" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
+ <property name="driverClassName" value="org.h2.Driver"/>
+ <property name="url" value="jdbc:h2:tcp://localhost/~/reportdb"/>
+ <property name="username" value="sa"/>
+ <property name="password" value=""/>
+ </bean>
- <!-- TransactionManager is required -->
- <bean id="txManager" class="org.springframework.orm.jpa.JpaTransactionManager">
- <property name="entityManagerFactory" ref="entityManagerFactory" />
- <property name="dataSource" ref="dataSourceHSQL" />
- </bean>
+ <!-- TransactionManager is required -->
+ <bean id="txManager" class="org.springframework.orm.jpa.JpaTransactionManager">
+ <property name="entityManagerFactory" ref="entityManagerFactory"/>
+ <property name="dataSource" ref="dataSourceH2"/>
+ </bean>
- <!-- Expose Transaction Manager -->
- <osgi:service ref="txManager" interface="org.springframework.transaction.PlatformTransactionManager">
+ <!-- Expose Transaction Manager -->
+ <osgi:service ref="txManager" interface="org.springframework.transaction.PlatformTransactionManager">
<osgi:service-properties>
<entry key="tx" value="JPA"/>
</osgi:service-properties>
View
65 reportincident.routing/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
Manifest-Version: 1.0
Built-By: charlesmoulliard
-Build-Jdk: 1.6.0_24
+Build-Jdk: 1.6.0_26
Bundle-Version: 1.0.0.SNAPSHOT
Tool: Bnd-0.0.357
Bundle-Name: Reportincident :: Routing Bundle
-Bnd-LastModified: 1305016892086
+Bnd-LastModified: 1320678050082
Created-By: Apache Maven Bundle Plugin
Bundle-ManifestVersion: 2
Bundle-SymbolicName: routing
@@ -13,34 +13,35 @@ Import-Package: META-INF.cxf,META-INF.cxf.osgi,META-INF.wsdl,javax.jms
.ws;version=0,org.apache.activemq.camel.component;version="[5.3,6.0)"
,org.apache.activemq.camel.converter;version="[5.3,6.0)",org.apache.a
ctivemq.pool;version="5.4",org.apache.camel;version="[2.0,3.0)",org.a
- pache.camel.component;version="[2.0,3.0)",org.apache.camel.component.
- cxf;version="[2.0,3.0)",org.apache.camel.component.cxf.converter;vers
- ion="[2.0,3.0)",org.apache.camel.component.jms;version="[2.0,3.0)",or
- g.apache.camel.converter;version="[2.0,3.0)",org.apache.camel.convert
- er.jaxp;version="[2.0,3.0)",org.apache.camel.converter.stream;version
- ="[2.0,3.0)",org.apache.camel.dataformat.bindy;version="[2.0,3.0)",or
- g.apache.camel.dataformat.bindy.csv;version="[2.0,3.0)",org.apache.ca
- mel.example.reportincident,org.apache.camel.example.reportincident.mo
- del,org.apache.camel.example.reportincident.service;version="1.0",org
- .apache.camel.processor;version="[2.0,3.0)",org.apache.commons.loggin
- g,org.apache.cxf;version="2.3",org.apache.cxf.binding;version="2.3",o
- rg.apache.cxf.binding.corba;version="2.3",org.apache.cxf.binding.soap
- ;version="2.3",org.apache.cxf.binding.soap.spring;version="2.3",org.a
- pache.cxf.bus;version="2.3",org.apache.cxf.bus.resource;version="2.3"
- ,org.apache.cxf.bus.spring;version="2.3",org.apache.cxf.buslifecycle;
- version="2.3",org.apache.cxf.catalog;version="2.3",org.apache.cxf.con
- figuration;version="2.3",org.apache.cxf.configuration.spring;version=
- "2.3",org.apache.cxf.endpoint;version="2.3",org.apache.cxf.headers;ve
- rsion="2.3",org.apache.cxf.management;version="2.3",org.apache.cxf.ma
- nagement.jmx;version="2.3",org.apache.cxf.phase;version="2.3",org.apa
- che.cxf.resource;version="2.3",org.apache.cxf.service.factory;version
- ="2.3",org.apache.cxf.tools.common.extensions.soap;version="2.3",org.
- apache.cxf.transport;version="2.3",org.apache.cxf.transport.http;vers
- ion="2.3",org.apache.cxf.transport.http.policy;version="2.3",org.apac
- he.cxf.transport.http_jetty;version="2.3",org.apache.cxf.transport.ht
- tp_osgi;version="2.3",org.apache.cxf.transport.jms;version="2.3",org.
- apache.cxf.transports.http;version="2.3",org.apache.cxf.workqueue;ver
- sion="2.3",org.apache.cxf.wsdl;version="2.3",org.apache.cxf.wsdl11;ve
- rsion="2.3",org.springframework.beans.factory.config;version="3.0",or
- g.w3c.dom;version=0,org.xmlsoap.schemas.soap.envelope;version=0
+ pache.camel.builder;version="2.8",org.apache.camel.builder.xml;versio
+ n="2.8",org.apache.camel.component;version="[2.0,3.0)",org.apache.cam
+ el.component.cxf;version="[2.0,3.0)",org.apache.camel.component.cxf.c
+ onverter;version="[2.0,3.0)",org.apache.camel.component.jms;version="
+ [2.0,3.0)",org.apache.camel.converter;version="[2.0,3.0)",org.apache.
+ camel.converter.jaxp;version="[2.0,3.0)",org.apache.camel.converter.s
+ tream;version="[2.0,3.0)",org.apache.camel.dataformat.bindy;version="
+ [2.0,3.0)",org.apache.camel.dataformat.bindy.csv;version="[2.0,3.0)",
+ org.apache.camel.example.reportincident,org.apache.camel.example.repo
+ rtincident.model,org.apache.camel.example.reportincident.service;vers
+ ion="1.0",org.apache.camel.model;version="2.8",org.apache.camel.proce
+ ssor;version="[2.0,3.0)",org.apache.commons.logging,org.apache.cxf;ve
+ rsion="2.4",org.apache.cxf.binding;version="2.4",org.apache.cxf.bindi
+ ng.corba;version="2.4",org.apache.cxf.binding.soap;version="2.4",org.
+ apache.cxf.binding.soap.spring;version="2.4",org.apache.cxf.bus;versi
+ on="2.4",org.apache.cxf.bus.resource;version="2.4",org.apache.cxf.bus
+ .spring;version="2.4",org.apache.cxf.buslifecycle;version="2.4",org.a
+ pache.cxf.catalog;version="2.4",org.apache.cxf.configuration;version=
+ "2.4",org.apache.cxf.configuration.spring;version="2.4",org.apache.cx
+ f.endpoint;version="2.4",org.apache.cxf.headers;version="2.4",org.apa
+ che.cxf.management;version="2.4",org.apache.cxf.management.jmx;versio
+ n="2.4",org.apache.cxf.phase;version="2.4",org.apache.cxf.resource;ve
+ rsion="2.4",org.apache.cxf.service.factory;version="2.4",org.apache.c
+ xf.tools.common.extensions.soap;version="2.4",org.apache.cxf.transpor
+ t;version="2.4",org.apache.cxf.transport.http;version="2.4",org.apach
+ e.cxf.transport.http.policy;version="2.4",org.apache.cxf.transport.ht
+ tp_jetty;version="2.4",org.apache.cxf.transport.jms;version="2.4",org
+ .apache.cxf.transports.http;version="2.4",org.apache.cxf.workqueue;ve
+ rsion="2.4",org.apache.cxf.wsdl;version="2.4",org.apache.cxf.wsdl11;v
+ ersion="2.4",org.springframework.beans.factory.config;version="3.0",o
+ rg.w3c.dom;version=0
View
2 reportincident.routing/pom.xml
@@ -168,7 +168,6 @@
javax.xml.namespace,
javax.xml.soap;version=0,
javax.xml.ws;version=0,
- org.xmlsoap.schemas.soap.envelope;version=0,
org.w3c.dom;version=0,
org.apache.commons.logging,
org.apache.camel;version="[2.0,3.0)",
@@ -212,7 +211,6 @@
org.apache.cxf.transport.http,
org.apache.cxf.transport.http.policy,
org.apache.cxf.transport.http_jetty,
- org.apache.cxf.transport.http_osgi,
org.apache.cxf.transport.jms,
org.apache.cxf.transports.http,
org.apache.cxf.workqueue,
View
24 ...routing/src/main/java/org/apache/camel/example/reportincident/internal/IncidentSaver.java
@@ -16,22 +16,16 @@
*/
package org.apache.camel.example.reportincident.internal;
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import org.apache.camel.Exchange;
import org.apache.camel.example.reportincident.model.Incident;
import org.apache.camel.example.reportincident.service.IncidentService;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
public class IncidentSaver {
@@ -77,9 +71,9 @@ public void process(Exchange exchange) throws ParseException {
LOG.debug("Count : " + count + ", " + incident.toString());
- // Save prg.apache.camel.example.reportincident.model.Incident
+ // Save org.apache.camel.example.reportincident.model.Incident
incidentService.saveIncident(incident);
- LOG.debug("org.apache.camel.example.reportincident.model.Incident saved");
+ LOG.debug(">>> org.apache.camel.example.reportincident.model.Incident saved");
}
count++;
View
8 reportincident.routing/src/main/resources/META-INF/spring/camel-context.xml
@@ -38,8 +38,6 @@
<import resource="classpath:META-INF/cxf/cxf.xml"/>
- <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml"/>
- <import resource="classpath:META-INF/cxf/cxf-extension-http-jetty.xml"/>
<context:property-placeholder properties-ref="camelProps"/>
@@ -72,7 +70,7 @@
<camelContext trace="true" xmlns="http://camel.apache.org/schema/spring">
- <route>
+ <route id="fileToQueueIn">
<from uri="file://data/reportincident/?move=backup/${date:now:yyyyMMdd}/${file:name.noext}.bak"/>
<setHeader headerName="origin">
<constant>file</constant>
@@ -81,12 +79,12 @@
<to uri="activemq:queue:in"/>
</route>
- <route>
+ <route id="queueIntoIncidentSaver">
<from uri="activemq:queue:in"/>
<to uri="bean:incidentSaver?method=process"/>
</route>
- <route>
+ <route id="webServiceToQueueIn">
<from uri="cxf:bean:reportIncident"/>
<setHeader headerName="origin">
<constant>webservice</constant>
View
4 reportincident.service/META-INF/MANIFEST.MF
@@ -3,11 +3,11 @@ Export-Package: META-INF.wsdl,org.apache.camel.example.reportincident.
service;uses:="org.apache.camel.example.reportincident.model";version
="1.0.0.SNAPSHOT"
Built-By: charlesmoulliard
-Build-Jdk: 1.6.0_24
+Build-Jdk: 1.6.0_26
Bundle-Version: 1.0.0.SNAPSHOT
Tool: Bnd-0.0.357
Bundle-Name: Reportincident :: Service Bundle
-Bnd-LastModified: 1305016881363
+Bnd-LastModified: 1320675583402
Created-By: Apache Maven Bundle Plugin
Bundle-ManifestVersion: 2
Bundle-SymbolicName: service
View
4 ...rtincident.service/META-INF/maven/org.apache.camel.example/reportincident.service/pom.xml
@@ -84,8 +84,8 @@
<configuration>
<manifestLocation>META-INF</manifestLocation>
<instructions>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
- <Bundle-Version>${pom.version}</Bundle-Version>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+ <Bundle-Version>${project.version}</Bundle-Version>
<Import-Package>
javax.xml.bind,
javax.jws,
View
6 reportincident.service/pom.xml
@@ -139,8 +139,8 @@
<configuration>
<manifestLocation>META-INF</manifestLocation>
<instructions>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
- <Bundle-Version>${pom.version}</Bundle-Version>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+ <Bundle-Version>${project.version}</Bundle-Version>
<Import-Package>
javax.xml.bind,
javax.jws,
@@ -163,7 +163,7 @@
</Private-Package>
<Export-Package>
'=META-INF.wsdl',
- org.apache.camel.example.reportincident.service;version="${pom.version}"
+ org.apache.camel.example.reportincident.service;version="${project.version}"
</Export-Package>
<_failok>true</_failok>
</instructions>
View
4 reportincident.web/pom.xml
@@ -251,8 +251,8 @@
javax.servlet.resources;version="[2.5.0, 3.0.0)",
org.apache.camel.example.reportincident.service,
org.apache.camel.example.reportincident.model,
- org.springframework.web.context;version="[2.5.6, 3.1.0)",
- org.springframework.web.context.support;version="[2.5.6, 3.1.0)",
+ org.springframework.web.context;version="[2.5.6, 4.0)",
+ org.springframework.web.context.support;version="[2.5.6, 4.0)",
org.springframework.osgi.web.context.support,
org.xml.sax;resolution:=optional,
org.w3c.dom;resolution:=optional,
View
4 reportincident.webservice/META-INF/MANIFEST.MF
@@ -3,11 +3,11 @@ Export-Package: org.apache.camel.example.reportincident;uses:="javax.x
ml.bind.annotation,javax.xml.bind,javax.xml.namespace,javax.jws.soap,
javax.jws,javax.xml.ws",META-INF.wsdl
Built-By: charlesmoulliard
-Build-Jdk: 1.6.0_24
+Build-Jdk: 1.6.0_26
Bundle-Version: 1.0.0.SNAPSHOT
Tool: Bnd-0.0.357
Bundle-Name: Reportincident :: Webservice Bundle
-Bnd-LastModified: 1305016887278
+Bnd-LastModified: 1320675598213
Created-By: Apache Maven Bundle Plugin
Bundle-ManifestVersion: 2
Bundle-SymbolicName: webservice

0 comments on commit 7f3aefa

Please sign in to comment.