Return-Path: X-Original-To: apmail-olingo-commits-archive@minotaur.apache.org Delivered-To: apmail-olingo-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4FCBA11AE3 for ; Tue, 2 Sep 2014 11:49:24 +0000 (UTC) Received: (qmail 53655 invoked by uid 500); 2 Sep 2014 11:49:24 -0000 Delivered-To: apmail-olingo-commits-archive@olingo.apache.org Received: (qmail 53605 invoked by uid 500); 2 Sep 2014 11:49:24 -0000 Mailing-List: contact commits-help@olingo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@olingo.apache.org Delivered-To: mailing list commits@olingo.apache.org Received: (qmail 53419 invoked by uid 99); 2 Sep 2014 11:49:23 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Sep 2014 11:49:23 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id C57279AEF3A; Tue, 2 Sep 2014 11:49:23 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mibo@apache.org To: commits@olingo.apache.org Date: Tue, 02 Sep 2014 11:50:06 -0000 Message-Id: <72d037cea76d44009fab312031a7cd94@git.apache.org> In-Reply-To: <41cc419758df42c8913433d697a32908@git.apache.org> References: <41cc419758df42c8913433d697a32908@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [46/50] [abbrv] git commit: [OLINGO-379] Normalize file endings (for OSX) [OLINGO-379] Normalize file endings (for OSX) Project: http://git-wip-us.apache.org/repos/asf/olingo-odata2/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata2/commit/7092ad31 Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata2/tree/7092ad31 Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata2/diff/7092ad31 Branch: refs/heads/Olingo-129_PocJpaDataStore Commit: 7092ad317a81c70154459518073f33d6d78aa2f2 Parents: 868e7e8 Author: Michael Bolz Authored: Wed Aug 13 10:21:01 2014 +0200 Committer: Michael Bolz Committed: Wed Aug 13 10:21:01 2014 +0200 ---------------------------------------------------------------------- odata2-sample/cars-annotation-archetype/pom.xml | 140 ++--- .../main/resources/archetype-resources/pom.xml | 296 +++++----- .../META-INF/maven/archetype-metadata.xml | 80 +-- .../src/main/java/model/Key.java | 190 +++---- .../java/service/ODataJPACarServiceFactory.java | 182 +++--- .../src/main/resources/META-INF/persistence.xml | 78 +-- .../src/main/webapp/index.html | 178 +++--- odata2-sample/cars-service-archetype/pom.xml | 158 +++--- .../main/resources/archetype-resources/pom.xml | 190 +++---- .../src/main/java/CarEdmProvider.java | 556 +++++++++---------- .../src/main/java/CarODataSingleProcessor.java | 302 +++++----- .../src/main/java/CarServiceFactory.java | 78 +-- 12 files changed, 1214 insertions(+), 1214 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/7092ad31/odata2-sample/cars-annotation-archetype/pom.xml ---------------------------------------------------------------------- diff --git a/odata2-sample/cars-annotation-archetype/pom.xml b/odata2-sample/cars-annotation-archetype/pom.xml index 27b86a6..d5f79f1 100644 --- a/odata2-sample/cars-annotation-archetype/pom.xml +++ b/odata2-sample/cars-annotation-archetype/pom.xml @@ -1,70 +1,70 @@ - - - - 4.0.0 - - org.apache.olingo - olingo-odata2-sample-cars-annotation-archetype - ${project.artifactId} - 2.0.1-SNAPSHOT - maven-archetype - - - org.apache.olingo - olingo-odata2-sample - 2.0.1-SNAPSHOT - .. - - - - - - org.apache.maven.archetype - archetype-packaging - 2.2 - - - - - - - org.apache.maven.plugins - maven-archetype-plugin - 2.2 - - - - - - - org.apache.maven.plugins - maven-archetype-plugin - - - integration-test - - integration-test - - - - - - org.apache.maven.plugins - maven-eclipse-plugin - - true - - - - - + + + + 4.0.0 + + org.apache.olingo + olingo-odata2-sample-cars-annotation-archetype + ${project.artifactId} + 2.0.1-SNAPSHOT + maven-archetype + + + org.apache.olingo + olingo-odata2-sample + 2.0.1-SNAPSHOT + .. + + + + + + org.apache.maven.archetype + archetype-packaging + 2.2 + + + + + + + org.apache.maven.plugins + maven-archetype-plugin + 2.2 + + + + + + + org.apache.maven.plugins + maven-archetype-plugin + + + integration-test + + integration-test + + + + + + org.apache.maven.plugins + maven-eclipse-plugin + + true + + + + + http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/7092ad31/odata2-sample/cars-annotation-archetype/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/odata2-sample/cars-annotation-archetype/src/main/resources/archetype-resources/pom.xml b/odata2-sample/cars-annotation-archetype/src/main/resources/archetype-resources/pom.xml index 1acbca5..98c79d6 100644 --- a/odata2-sample/cars-annotation-archetype/src/main/resources/archetype-resources/pom.xml +++ b/odata2-sample/cars-annotation-archetype/src/main/resources/archetype-resources/pom.xml @@ -1,148 +1,148 @@ - - - - 4.0.0 - - ${groupId} - ${artifactId} - ${version} - ${project.artifactId} - - war - - - UTF-8 - - 2.3.2 - 2.8.1 - 2.9 - 8.1.14.v20131031 - - 2.7.6 - 2.5 - 2.0-m10 - 1.7.1 - 2.0.1-SNAPSHOT - - - - ${project.artifactId} - package jetty:run - - - src/main/version - true - ../${project.build.finalName}/gen - - - src/main/resources - true - - - target/maven-shared-archive-resources - - - - - - org.apache.maven.plugins - maven-compiler-plugin - ${version.compiler-plugin} - - 1.6 - 1.6 - - - - org.apache.maven.plugins - maven-deploy-plugin - ${version.deploy-plugin} - - true - - - - org.apache.maven.plugins - maven-eclipse-plugin - ${version.eclipse-plugin} - - true - true - 2.0 - true - true - - - - org.mortbay.jetty - jetty-maven-plugin - ${version.jetty-plugin} - - - - - - - - org.apache.olingo - olingo-odata2-api - ${version.olingo} - - - olingo-odata2-api-annotation - org.apache.olingo - jar - ${version.olingo} - - - org.apache.olingo - olingo-odata2-core - ${version.olingo} - - - - org.apache.olingo - olingo-odata2-annotation-processor-api - ${version.olingo} - - - org.apache.olingo - olingo-odata2-annotation-processor-core - ${version.olingo} - - - - org.slf4j - slf4j-log4j12 - ${version.slf4j} - - - - - javax.servlet - servlet-api - ${version.servlet-api} - provided - - - javax.ws.rs - javax.ws.rs-api - ${version.jaxrs-api} - - - org.apache.cxf - cxf-rt-frontend-jaxrs - ${version.cxf} - - - + + + + 4.0.0 + + ${groupId} + ${artifactId} + ${version} + ${project.artifactId} + + war + + + UTF-8 + + 2.3.2 + 2.8.1 + 2.9 + 8.1.14.v20131031 + + 2.7.6 + 2.5 + 2.0-m10 + 1.7.1 + 2.0.1-SNAPSHOT + + + + ${project.artifactId} + package jetty:run + + + src/main/version + true + ../${project.build.finalName}/gen + + + src/main/resources + true + + + target/maven-shared-archive-resources + + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${version.compiler-plugin} + + 1.6 + 1.6 + + + + org.apache.maven.plugins + maven-deploy-plugin + ${version.deploy-plugin} + + true + + + + org.apache.maven.plugins + maven-eclipse-plugin + ${version.eclipse-plugin} + + true + true + 2.0 + true + true + + + + org.mortbay.jetty + jetty-maven-plugin + ${version.jetty-plugin} + + + + + + + + org.apache.olingo + olingo-odata2-api + ${version.olingo} + + + olingo-odata2-api-annotation + org.apache.olingo + jar + ${version.olingo} + + + org.apache.olingo + olingo-odata2-core + ${version.olingo} + + + + org.apache.olingo + olingo-odata2-annotation-processor-api + ${version.olingo} + + + org.apache.olingo + olingo-odata2-annotation-processor-core + ${version.olingo} + + + + org.slf4j + slf4j-log4j12 + ${version.slf4j} + + + + + javax.servlet + servlet-api + ${version.servlet-api} + provided + + + javax.ws.rs + javax.ws.rs-api + ${version.jaxrs-api} + + + org.apache.cxf + cxf-rt-frontend-jaxrs + ${version.cxf} + + + http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/7092ad31/odata2-sample/cars-jpa-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml ---------------------------------------------------------------------- diff --git a/odata2-sample/cars-jpa-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/odata2-sample/cars-jpa-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml index c7a1d29..c45b09e 100644 --- a/odata2-sample/cars-jpa-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml +++ b/odata2-sample/cars-jpa-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -1,40 +1,40 @@ - - - - - - src/main/java - - **/*.java - - - - src/main/webapp - - **/*.xml - **/*.html - - - - src/main/resources - - **/*.xml - - - - - - .classpath - .project - - - - + + + + + + src/main/java + + **/*.java + + + + src/main/webapp + + **/*.xml + **/*.html + + + + src/main/resources + + **/*.xml + + + + + + .classpath + .project + + + + http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/7092ad31/odata2-sample/cars-jpa-archetype/src/main/resources/archetype-resources/src/main/java/model/Key.java ---------------------------------------------------------------------- diff --git a/odata2-sample/cars-jpa-archetype/src/main/resources/archetype-resources/src/main/java/model/Key.java b/odata2-sample/cars-jpa-archetype/src/main/resources/archetype-resources/src/main/java/model/Key.java index 8b93c20..91e890d 100644 --- a/odata2-sample/cars-jpa-archetype/src/main/resources/archetype-resources/src/main/java/model/Key.java +++ b/odata2-sample/cars-jpa-archetype/src/main/resources/archetype-resources/src/main/java/model/Key.java @@ -1,96 +1,96 @@ -/******************************************************************************* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - ******************************************************************************/ -#set( $symbol_pound = '#' ) -#set( $symbol_dollar = '$' ) -#set( $symbol_escape = '\' ) -package ${package}.model; - -import java.io.Serializable; - -import javax.persistence.Column; -import javax.persistence.Embeddable; - -@Embeddable -public class Key implements Serializable { - - private static final long serialVersionUID = -623040896539742071L; - - @Column(name = "ID") - private int id; - - @Column(name = "IDL") - private long idL; - - public Key() { - - } - - public Key(int id, long idL) { - super(); - this.id = id; - this.idL = idL; - } - - public int getId() { - return id; - } - - public void setId(int id) { - this.id = id; - } - - public long getIdL() { - return idL; - } - - public void setIdL(long idL) { - this.idL = idL; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + (int) (id ^ (id >>> 32)); - result = prime * result + (int) (idL ^ (idL >>> 32)); - return result; - } - - @Override - public boolean equals(final Object obj) { - if (this == obj) { - return true; - } - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - Key other = (Key) obj; - if (id != other.id) { - return false; - } - if (idL != other.idL) { - return false; - } - return true; - } - +/******************************************************************************* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + ******************************************************************************/ +#set( $symbol_pound = '#' ) +#set( $symbol_dollar = '$' ) +#set( $symbol_escape = '\' ) +package ${package}.model; + +import java.io.Serializable; + +import javax.persistence.Column; +import javax.persistence.Embeddable; + +@Embeddable +public class Key implements Serializable { + + private static final long serialVersionUID = -623040896539742071L; + + @Column(name = "ID") + private int id; + + @Column(name = "IDL") + private long idL; + + public Key() { + + } + + public Key(int id, long idL) { + super(); + this.id = id; + this.idL = idL; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public long getIdL() { + return idL; + } + + public void setIdL(long idL) { + this.idL = idL; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + (int) (id ^ (id >>> 32)); + result = prime * result + (int) (idL ^ (idL >>> 32)); + return result; + } + + @Override + public boolean equals(final Object obj) { + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + Key other = (Key) obj; + if (id != other.id) { + return false; + } + if (idL != other.idL) { + return false; + } + return true; + } + } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/7092ad31/odata2-sample/cars-jpa-archetype/src/main/resources/archetype-resources/src/main/java/service/ODataJPACarServiceFactory.java ---------------------------------------------------------------------- diff --git a/odata2-sample/cars-jpa-archetype/src/main/resources/archetype-resources/src/main/java/service/ODataJPACarServiceFactory.java b/odata2-sample/cars-jpa-archetype/src/main/resources/archetype-resources/src/main/java/service/ODataJPACarServiceFactory.java index bdd153c..ecf628f 100644 --- a/odata2-sample/cars-jpa-archetype/src/main/resources/archetype-resources/src/main/java/service/ODataJPACarServiceFactory.java +++ b/odata2-sample/cars-jpa-archetype/src/main/resources/archetype-resources/src/main/java/service/ODataJPACarServiceFactory.java @@ -1,91 +1,91 @@ -/******************************************************************************* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - ******************************************************************************/ -#set( $symbol_pound = '#' ) -#set( $symbol_dollar = '$' ) -#set( $symbol_escape = '\' ) -package ${package}.service; - -import java.util.ArrayList; -import java.util.Calendar; -import java.util.List; - -import javax.persistence.EntityManager; -import javax.persistence.Persistence; - -import org.apache.olingo.odata2.jpa.processor.api.ODataJPAContext; -import org.apache.olingo.odata2.jpa.processor.api.ODataJPAServiceFactory; -import org.apache.olingo.odata2.jpa.processor.api.exception.ODataJPARuntimeException; - -import ${package}.model.Address; -import ${package}.model.Car; -import ${package}.model.Driver; -import ${package}.model.Key; -import ${package}.model.Manufacturer; - -public class ODataJPACarServiceFactory extends ODataJPAServiceFactory { - - private static final String PUNIT_NAME = "MyFormula"; - private static final int PAGE_SIZE = 5; - - /** Load Sample Data **/ - static { - - List cars = new ArrayList(); - Calendar mfDate = Calendar.getInstance(); - mfDate.set(2013, 02, 01); - Address address = new Address("S1", "C1", "Z1", "CN"); - - Manufacturer mf = new Manufacturer(1, "SuperCar", mfDate, address, cars); - - Calendar bDate = Calendar.getInstance(); - mfDate.set(1980, 02, 19); - Driver driver = new Driver(1L, "Speeder", "Super", "Bolt", null, bDate); - - Key key = new Key(1, 2); - Calendar carDate = Calendar.getInstance(); - carDate.set(2014, 02, 20); - Car car = new Car(key, "M1", 20000.0, 2014, carDate.getTime(), mf, - driver); - cars.add(car); - driver.setCar(car); - - EntityManager em = Persistence.createEntityManagerFactory(PUNIT_NAME) - .createEntityManager(); - em.getTransaction().begin(); - em.persist(mf); - em.persist(driver); - em.persist(car); - em.getTransaction().commit(); - - } - - @Override - public ODataJPAContext initializeODataJPAContext() - throws ODataJPARuntimeException { - ODataJPAContext oDataJPAContext = getODataJPAContext(); - oDataJPAContext.setEntityManagerFactory(Persistence - .createEntityManagerFactory(PUNIT_NAME)); - oDataJPAContext.setPersistenceUnitName(PUNIT_NAME); - - oDataJPAContext.setPageSize(PAGE_SIZE); - setDetailErrors(true); - - return oDataJPAContext; - } -} +/******************************************************************************* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + ******************************************************************************/ +#set( $symbol_pound = '#' ) +#set( $symbol_dollar = '$' ) +#set( $symbol_escape = '\' ) +package ${package}.service; + +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + +import javax.persistence.EntityManager; +import javax.persistence.Persistence; + +import org.apache.olingo.odata2.jpa.processor.api.ODataJPAContext; +import org.apache.olingo.odata2.jpa.processor.api.ODataJPAServiceFactory; +import org.apache.olingo.odata2.jpa.processor.api.exception.ODataJPARuntimeException; + +import ${package}.model.Address; +import ${package}.model.Car; +import ${package}.model.Driver; +import ${package}.model.Key; +import ${package}.model.Manufacturer; + +public class ODataJPACarServiceFactory extends ODataJPAServiceFactory { + + private static final String PUNIT_NAME = "MyFormula"; + private static final int PAGE_SIZE = 5; + + /** Load Sample Data **/ + static { + + List cars = new ArrayList(); + Calendar mfDate = Calendar.getInstance(); + mfDate.set(2013, 02, 01); + Address address = new Address("S1", "C1", "Z1", "CN"); + + Manufacturer mf = new Manufacturer(1, "SuperCar", mfDate, address, cars); + + Calendar bDate = Calendar.getInstance(); + mfDate.set(1980, 02, 19); + Driver driver = new Driver(1L, "Speeder", "Super", "Bolt", null, bDate); + + Key key = new Key(1, 2); + Calendar carDate = Calendar.getInstance(); + carDate.set(2014, 02, 20); + Car car = new Car(key, "M1", 20000.0, 2014, carDate.getTime(), mf, + driver); + cars.add(car); + driver.setCar(car); + + EntityManager em = Persistence.createEntityManagerFactory(PUNIT_NAME) + .createEntityManager(); + em.getTransaction().begin(); + em.persist(mf); + em.persist(driver); + em.persist(car); + em.getTransaction().commit(); + + } + + @Override + public ODataJPAContext initializeODataJPAContext() + throws ODataJPARuntimeException { + ODataJPAContext oDataJPAContext = getODataJPAContext(); + oDataJPAContext.setEntityManagerFactory(Persistence + .createEntityManagerFactory(PUNIT_NAME)); + oDataJPAContext.setPersistenceUnitName(PUNIT_NAME); + + oDataJPAContext.setPageSize(PAGE_SIZE); + setDetailErrors(true); + + return oDataJPAContext; + } +} http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/7092ad31/odata2-sample/cars-jpa-archetype/src/main/resources/archetype-resources/src/main/resources/META-INF/persistence.xml ---------------------------------------------------------------------- diff --git a/odata2-sample/cars-jpa-archetype/src/main/resources/archetype-resources/src/main/resources/META-INF/persistence.xml b/odata2-sample/cars-jpa-archetype/src/main/resources/archetype-resources/src/main/resources/META-INF/persistence.xml index dd20900..73321e4 100644 --- a/odata2-sample/cars-jpa-archetype/src/main/resources/archetype-resources/src/main/resources/META-INF/persistence.xml +++ b/odata2-sample/cars-jpa-archetype/src/main/resources/archetype-resources/src/main/resources/META-INF/persistence.xml @@ -1,39 +1,39 @@ -#set( $symbol_pound = '#' ) -#set( $symbol_dollar = '$' ) -#set( $symbol_escape = '\' ) - - - - - org.eclipse.persistence.jpa.PersistenceProvider - ${package}.model.Driver - ${package}.model.Car - ${package}.model.Manufacturer - - - - - - - - - - - - - +#set( $symbol_pound = '#' ) +#set( $symbol_dollar = '$' ) +#set( $symbol_escape = '\' ) + + + + + org.eclipse.persistence.jpa.PersistenceProvider + ${package}.model.Driver + ${package}.model.Car + ${package}.model.Manufacturer + + + + + + + + + + + + + http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/7092ad31/odata2-sample/cars-jpa-archetype/src/main/resources/archetype-resources/src/main/webapp/index.html ---------------------------------------------------------------------- diff --git a/odata2-sample/cars-jpa-archetype/src/main/resources/archetype-resources/src/main/webapp/index.html b/odata2-sample/cars-jpa-archetype/src/main/resources/archetype-resources/src/main/webapp/index.html index 40076bc..238460d 100644 --- a/odata2-sample/cars-jpa-archetype/src/main/resources/archetype-resources/src/main/webapp/index.html +++ b/odata2-sample/cars-jpa-archetype/src/main/resources/archetype-resources/src/main/webapp/index.html @@ -1,89 +1,89 @@ - - - - - -Apache Olingo - OData2 Library - - - -

Apache Olingo - OData2 Library

-
-

Cars OData JPA Service

- - - - -
-

Service Document and Metadata

- -

EntitySets

- -

Entities

- -
- - + + + + + +Apache Olingo - OData2 Library + + + +

Apache Olingo - OData2 Library

+
+

Cars OData JPA Service

+ + + + +
+

Service Document and Metadata

+ +

EntitySets

+ +

Entities

+ +
+ + http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/7092ad31/odata2-sample/cars-service-archetype/pom.xml ---------------------------------------------------------------------- diff --git a/odata2-sample/cars-service-archetype/pom.xml b/odata2-sample/cars-service-archetype/pom.xml index 569be90..8e2a7f2 100644 --- a/odata2-sample/cars-service-archetype/pom.xml +++ b/odata2-sample/cars-service-archetype/pom.xml @@ -1,79 +1,79 @@ - - - - 4.0.0 - - org.apache.olingo - olingo-odata2-sample-cars-service-archetype - ${project.artifactId} - 2.0.1-SNAPSHOT - - maven-archetype - - - org.apache.olingo - olingo-odata2-sample - 2.0.1-SNAPSHOT - .. - - - - - - org.apache.maven.archetype - archetype-packaging - 2.2 - - - - - - - org.apache.maven.plugins - maven-archetype-plugin - 2.2 - - - - - - - org.apache.maven.plugins - maven-archetype-plugin - - - integration-test - - integration-test - - - - - - org.apache.maven.plugins - maven-eclipse-plugin - - true - - - - - + + + + 4.0.0 + + org.apache.olingo + olingo-odata2-sample-cars-service-archetype + ${project.artifactId} + 2.0.1-SNAPSHOT + + maven-archetype + + + org.apache.olingo + olingo-odata2-sample + 2.0.1-SNAPSHOT + .. + + + + + + org.apache.maven.archetype + archetype-packaging + 2.2 + + + + + + + org.apache.maven.plugins + maven-archetype-plugin + 2.2 + + + + + + + org.apache.maven.plugins + maven-archetype-plugin + + + integration-test + + integration-test + + + + + + org.apache.maven.plugins + maven-eclipse-plugin + + true + + + + + http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/7092ad31/odata2-sample/cars-service-archetype/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/odata2-sample/cars-service-archetype/src/main/resources/archetype-resources/pom.xml b/odata2-sample/cars-service-archetype/src/main/resources/archetype-resources/pom.xml index 4400759..2bcb9b4 100644 --- a/odata2-sample/cars-service-archetype/src/main/resources/archetype-resources/pom.xml +++ b/odata2-sample/cars-service-archetype/src/main/resources/archetype-resources/pom.xml @@ -1,101 +1,101 @@ - + - - 4.0.0 - - ${groupId} - ${artifactId} - ${project.artifactId} - ${version} - - war - - - UTF-8 - 2.7.6 - 1.7.1 - 2.0.1-SNAPSHOT - - - - ${project.artifactId} - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - - org.apache.maven.plugins - maven-war-plugin - 2.4 - - - org.apache.maven.plugins - maven-eclipse-plugin - 2.9 - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.6 - 1.6 - - - - org.apache.maven.plugins - maven-eclipse-plugin - - true - true - 2.0 - true - true - - - - - - - - - org.apache.olingo - olingo-odata2-core - ${version.olingo} - - - javax.servlet - servlet-api - 2.5 - provided - - - org.apache.cxf - cxf-rt-frontend-jaxrs - ${version.cxf} - - - org.slf4j - slf4j-api - ${version.slf4j} - - - org.slf4j - slf4j-log4j12 - ${version.slf4j} - - - + the License. --> + + 4.0.0 + + ${groupId} + ${artifactId} + ${project.artifactId} + ${version} + + war + + + UTF-8 + 2.7.6 + 1.7.1 + 2.0.1-SNAPSHOT + + + + ${project.artifactId} + + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.3.2 + + + org.apache.maven.plugins + maven-war-plugin + 2.4 + + + org.apache.maven.plugins + maven-eclipse-plugin + 2.9 + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.6 + 1.6 + + + + org.apache.maven.plugins + maven-eclipse-plugin + + true + true + 2.0 + true + true + + + + + + + + + org.apache.olingo + olingo-odata2-core + ${version.olingo} + + + javax.servlet + servlet-api + 2.5 + provided + + + org.apache.cxf + cxf-rt-frontend-jaxrs + ${version.cxf} + + + org.slf4j + slf4j-api + ${version.slf4j} + + + org.slf4j + slf4j-log4j12 + ${version.slf4j} + + +