Line ending issue
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata2/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata2/commit/ffb21db2 Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata2/tree/ffb21db2 Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata2/diff/ffb21db2 Branch: refs/heads/master Commit: ffb21db2dce53add1f6b98e796a5ac13a18a61ab Parents: 6eca235 Author: Christian Amend <[email protected]> Authored: Mon Oct 6 13:15:32 2014 +0200 Committer: Christian Amend <[email protected]> Committed: Mon Oct 6 13:15:32 2014 +0200 ---------------------------------------------------------------------- .../src/main/resources/SQL_Cleanup.properties | 42 +- .../resources/SQL_Insert_Category.properties | 42 +- .../main/resources/SQL_Insert_Config.properties | 42 +- .../resources/SQL_Insert_Customer.properties | 44 +- .../resources/SQL_Insert_Material.properties | 58 +- .../SQL_Insert_SalesOrderHeader.properties | 58 +- .../SQL_Insert_SalesOrderItem.properties | 60 +- .../main/resources/SQL_Insert_Store.properties | 58 +- .../src/main/resources/serviceConfig.properties | 36 +- .../jpa-web/src/main/webapp/WEB-INF/web.xml | 54 +- .../jpa-web/src/main/webapp/index.jsp | 664 +++++++++---------- odata2-lib/odata-annotation/.gitignore | 16 +- .../src/main/java/META-INF/MANIFEST.MF | 6 +- 13 files changed, 590 insertions(+), 590 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/ffb21db2/odata2-jpa-processor/jpa-web/src/main/resources/SQL_Cleanup.properties ---------------------------------------------------------------------- diff --git a/odata2-jpa-processor/jpa-web/src/main/resources/SQL_Cleanup.properties b/odata2-jpa-processor/jpa-web/src/main/resources/SQL_Cleanup.properties index 19f859d..27c4f3d 100644 --- a/odata2-jpa-processor/jpa-web/src/main/resources/SQL_Cleanup.properties +++ b/odata2-jpa-processor/jpa-web/src/main/resources/SQL_Cleanup.properties @@ -1,22 +1,22 @@ -#------------------------------------------------------------------------------- -# 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. -#------------------------------------------------------------------------------- - -#Config file for deleting the entities. They are deleted in the order provided in the below comma-separated string. -#It is mandatory due to referential constaints. +#------------------------------------------------------------------------------- +# 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. +#------------------------------------------------------------------------------- + +#Config file for deleting the entities. They are deleted in the order provided in the below comma-separated string. +#It is mandatory due to referential constaints. delete_queries = DELETE FROM T_NOTE,DELETE FROM T_SALESORDERITEM,DELETE FROM T_MATERIAL_T_STORE,DELETE FROM T_MATERIAL,DELETE FROM T_STORE,DELETE FROM T_SALESORDERHEADER \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/ffb21db2/odata2-jpa-processor/jpa-web/src/main/resources/SQL_Insert_Category.properties ---------------------------------------------------------------------- diff --git a/odata2-jpa-processor/jpa-web/src/main/resources/SQL_Insert_Category.properties b/odata2-jpa-processor/jpa-web/src/main/resources/SQL_Insert_Category.properties index d9b44e6..6bda640 100644 --- a/odata2-jpa-processor/jpa-web/src/main/resources/SQL_Insert_Category.properties +++ b/odata2-jpa-processor/jpa-web/src/main/resources/SQL_Insert_Category.properties @@ -1,22 +1,22 @@ -#------------------------------------------------------------------------------- -# 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. -#------------------------------------------------------------------------------- -query_1 = INSERT INTO T_CATEGORY (CODE,ID,DESC) VALUES('P1',1,'Pen'); -query_2 = INSERT INTO T_CATEGORY (CODE,ID,DESC) VALUES('P2',1,'Pencil'); -query_3 = INSERT INTO T_CATEGORY (CODE,ID,DESC) VALUES('S1',2,'Sharpner'); +#------------------------------------------------------------------------------- +# 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. +#------------------------------------------------------------------------------- +query_1 = INSERT INTO T_CATEGORY (CODE,ID,DESC) VALUES('P1',1,'Pen'); +query_2 = INSERT INTO T_CATEGORY (CODE,ID,DESC) VALUES('P2',1,'Pencil'); +query_3 = INSERT INTO T_CATEGORY (CODE,ID,DESC) VALUES('S1',2,'Sharpner'); query_4 = INSERT INTO T_CATEGORY (CODE,ID,DESC) VALUES('E1',3,'Eraser'); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/ffb21db2/odata2-jpa-processor/jpa-web/src/main/resources/SQL_Insert_Config.properties ---------------------------------------------------------------------- diff --git a/odata2-jpa-processor/jpa-web/src/main/resources/SQL_Insert_Config.properties b/odata2-jpa-processor/jpa-web/src/main/resources/SQL_Insert_Config.properties index 5910123..6a55bab 100644 --- a/odata2-jpa-processor/jpa-web/src/main/resources/SQL_Insert_Config.properties +++ b/odata2-jpa-processor/jpa-web/src/main/resources/SQL_Insert_Config.properties @@ -1,22 +1,22 @@ -#------------------------------------------------------------------------------- -# 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. -#------------------------------------------------------------------------------- - -#This file contains names of file which will contain the SQL statements to be executed by Data generator. Add a file name here and it will be picked up by Generator -#You need to put the file names in order you want to get them called. First Entry will be inserted first. +#------------------------------------------------------------------------------- +# 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. +#------------------------------------------------------------------------------- + +#This file contains names of file which will contain the SQL statements to be executed by Data generator. Add a file name here and it will be picked up by Generator +#You need to put the file names in order you want to get them called. First Entry will be inserted first. insert_file_names = SQL_Insert_Customer,SQL_Insert_Category,SQL_Insert_SalesOrderHeader,SQL_Insert_Store,SQL_Insert_Material,SQL_Insert_SalesOrderItem,SQL_Insert_Note \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/ffb21db2/odata2-jpa-processor/jpa-web/src/main/resources/SQL_Insert_Customer.properties ---------------------------------------------------------------------- diff --git a/odata2-jpa-processor/jpa-web/src/main/resources/SQL_Insert_Customer.properties b/odata2-jpa-processor/jpa-web/src/main/resources/SQL_Insert_Customer.properties index fe52d68..a42f23e 100644 --- a/odata2-jpa-processor/jpa-web/src/main/resources/SQL_Insert_Customer.properties +++ b/odata2-jpa-processor/jpa-web/src/main/resources/SQL_Insert_Customer.properties @@ -1,23 +1,23 @@ -#------------------------------------------------------------------------------- -# 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. -#------------------------------------------------------------------------------- -query_1 = INSERT INTO T_CUSTOMER (ID , NAME, HOUSE_NUMBER , STREET_NAME, CITY, COUNTRY, PINCODE,CREATED_AT) VALUES(100,'Bob Bryan',7,'5 cross Street', 'London', 'UK', 'E7','2012-11-01 00:01:00'); -query_2 = INSERT INTO T_CUSTOMER (ID , NAME, HOUSE_NUMBER , STREET_NAME, CITY, COUNTRY, PINCODE,CREATED_AT) VALUES(200,'Mike Bryan',7,'8 cross Street', 'New York', 'USA', '10011','2012-11-01 00:01:00'); -query_3 = INSERT INTO T_CUSTOMER (ID , NAME, HOUSE_NUMBER , STREET_NAME, CITY, COUNTRY, PINCODE,CREATED_AT) VALUES(201,'Steve Roger',7,'9 cross Street', 'Mumbai', 'India', '200101','2012-11-01 00:01:00'); -query_4 = INSERT INTO T_CUSTOMER (ID , NAME, HOUSE_NUMBER , STREET_NAME, CITY, COUNTRY, PINCODE,CREATED_AT) VALUES(101,'Pac Man',7,'25 cross Street', 'Frankfurt', 'Germany', '60001','2012-11-01 00:01:00'); +#------------------------------------------------------------------------------- +# 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. +#------------------------------------------------------------------------------- +query_1 = INSERT INTO T_CUSTOMER (ID , NAME, HOUSE_NUMBER , STREET_NAME, CITY, COUNTRY, PINCODE,CREATED_AT) VALUES(100,'Bob Bryan',7,'5 cross Street', 'London', 'UK', 'E7','2012-11-01 00:01:00'); +query_2 = INSERT INTO T_CUSTOMER (ID , NAME, HOUSE_NUMBER , STREET_NAME, CITY, COUNTRY, PINCODE,CREATED_AT) VALUES(200,'Mike Bryan',7,'8 cross Street', 'New York', 'USA', '10011','2012-11-01 00:01:00'); +query_3 = INSERT INTO T_CUSTOMER (ID , NAME, HOUSE_NUMBER , STREET_NAME, CITY, COUNTRY, PINCODE,CREATED_AT) VALUES(201,'Steve Roger',7,'9 cross Street', 'Mumbai', 'India', '200101','2012-11-01 00:01:00'); +query_4 = INSERT INTO T_CUSTOMER (ID , NAME, HOUSE_NUMBER , STREET_NAME, CITY, COUNTRY, PINCODE,CREATED_AT) VALUES(101,'Pac Man',7,'25 cross Street', 'Frankfurt', 'Germany', '60001','2012-11-01 00:01:00'); query_5 = INSERT INTO T_CUSTOMER (ID , NAME, HOUSE_NUMBER , STREET_NAME, CITY, COUNTRY, PINCODE,CREATED_AT) VALUES(202,'Bolt Man',7,'25 cross Street', 'Toronto', 'Canada', 'NE','2012-11-01 00:01:00'); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/ffb21db2/odata2-jpa-processor/jpa-web/src/main/resources/SQL_Insert_Material.properties ---------------------------------------------------------------------- diff --git a/odata2-jpa-processor/jpa-web/src/main/resources/SQL_Insert_Material.properties b/odata2-jpa-processor/jpa-web/src/main/resources/SQL_Insert_Material.properties index 653fafd..7c64d36 100644 --- a/odata2-jpa-processor/jpa-web/src/main/resources/SQL_Insert_Material.properties +++ b/odata2-jpa-processor/jpa-web/src/main/resources/SQL_Insert_Material.properties @@ -1,30 +1,30 @@ -#------------------------------------------------------------------------------- -# 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. -#------------------------------------------------------------------------------- - -material_query_1 = insert into T_MATERIAL (MATERIAL_ID , MATERIAL_NAME, TYPE_CODE, CAT_ID, PRICE, MEASUREMENT_UNIT) values(111, 'My Pen', 'P1', 1, 111.1, 'Piece'); -material_query_2 = insert into T_MATERIAL (MATERIAL_ID , MATERIAL_NAME, TYPE_CODE, CAT_ID, PRICE, MEASUREMENT_UNIT) values(112, 'My Great Pen', 'P1', 1, 112.1, 'Piece'); -material_query_3 = insert into T_MATERIAL (MATERIAL_ID , MATERIAL_NAME, TYPE_CODE, CAT_ID, PRICE, MEASUREMENT_UNIT) values(113, 'Super Pen', 'P1', 1, 113.1, 'Piece'); -material_query_4 = insert into T_MATERIAL (MATERIAL_ID , MATERIAL_NAME, TYPE_CODE, CAT_ID, PRICE, MEASUREMENT_UNIT) values(114, 'Marvel Pen', 'P1', 1, 114.1, 'Piece'); -material_query_5 = insert into T_MATERIAL (MATERIAL_ID , MATERIAL_NAME, TYPE_CODE, CAT_ID, PRICE, MEASUREMENT_UNIT) values(115, 'Smooth', 'P2', 1, 115.1, 'Piece'); -material_query_6 = insert into T_MATERIAL (MATERIAL_ID , MATERIAL_NAME, TYPE_CODE, CAT_ID, PRICE, MEASUREMENT_UNIT) values(116, 'Silver Line', 'P2', 1, 116.1, 'Piece'); -material_query_7 = insert into T_MATERIAL (MATERIAL_ID , MATERIAL_NAME, TYPE_CODE, CAT_ID, PRICE, MEASUREMENT_UNIT) values(117, 'Dark Line', 'P2', 1, 117.1, 'Piece'); -material_query_8 = insert into T_MATERIAL (MATERIAL_ID , MATERIAL_NAME, TYPE_CODE, CAT_ID, PRICE, MEASUREMENT_UNIT) values(118, 'Sharp', 'S1', 2, 118.1, 'Piece'); -material_query_9 = insert into T_MATERIAL (MATERIAL_ID , MATERIAL_NAME, TYPE_CODE, CAT_ID, PRICE, MEASUREMENT_UNIT) values(119, 'Cut Sharp', 'S1', 2, 119.1, 'Piece'); -material_query_10 = insert into T_MATERIAL (MATERIAL_ID , MATERIAL_NAME, TYPE_CODE, CAT_ID, PRICE, MEASUREMENT_UNIT) values(120, 'Thin line', 'S1', 2, 120.1, 'Piece'); +#------------------------------------------------------------------------------- +# 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. +#------------------------------------------------------------------------------- + +material_query_1 = insert into T_MATERIAL (MATERIAL_ID , MATERIAL_NAME, TYPE_CODE, CAT_ID, PRICE, MEASUREMENT_UNIT) values(111, 'My Pen', 'P1', 1, 111.1, 'Piece'); +material_query_2 = insert into T_MATERIAL (MATERIAL_ID , MATERIAL_NAME, TYPE_CODE, CAT_ID, PRICE, MEASUREMENT_UNIT) values(112, 'My Great Pen', 'P1', 1, 112.1, 'Piece'); +material_query_3 = insert into T_MATERIAL (MATERIAL_ID , MATERIAL_NAME, TYPE_CODE, CAT_ID, PRICE, MEASUREMENT_UNIT) values(113, 'Super Pen', 'P1', 1, 113.1, 'Piece'); +material_query_4 = insert into T_MATERIAL (MATERIAL_ID , MATERIAL_NAME, TYPE_CODE, CAT_ID, PRICE, MEASUREMENT_UNIT) values(114, 'Marvel Pen', 'P1', 1, 114.1, 'Piece'); +material_query_5 = insert into T_MATERIAL (MATERIAL_ID , MATERIAL_NAME, TYPE_CODE, CAT_ID, PRICE, MEASUREMENT_UNIT) values(115, 'Smooth', 'P2', 1, 115.1, 'Piece'); +material_query_6 = insert into T_MATERIAL (MATERIAL_ID , MATERIAL_NAME, TYPE_CODE, CAT_ID, PRICE, MEASUREMENT_UNIT) values(116, 'Silver Line', 'P2', 1, 116.1, 'Piece'); +material_query_7 = insert into T_MATERIAL (MATERIAL_ID , MATERIAL_NAME, TYPE_CODE, CAT_ID, PRICE, MEASUREMENT_UNIT) values(117, 'Dark Line', 'P2', 1, 117.1, 'Piece'); +material_query_8 = insert into T_MATERIAL (MATERIAL_ID , MATERIAL_NAME, TYPE_CODE, CAT_ID, PRICE, MEASUREMENT_UNIT) values(118, 'Sharp', 'S1', 2, 118.1, 'Piece'); +material_query_9 = insert into T_MATERIAL (MATERIAL_ID , MATERIAL_NAME, TYPE_CODE, CAT_ID, PRICE, MEASUREMENT_UNIT) values(119, 'Cut Sharp', 'S1', 2, 119.1, 'Piece'); +material_query_10 = insert into T_MATERIAL (MATERIAL_ID , MATERIAL_NAME, TYPE_CODE, CAT_ID, PRICE, MEASUREMENT_UNIT) values(120, 'Thin line', 'S1', 2, 120.1, 'Piece'); material_query_11 = insert into T_MATERIAL (MATERIAL_ID , MATERIAL_NAME, TYPE_CODE, CAT_ID, PRICE, MEASUREMENT_UNIT) values(121, 'Clean', 'E1', 3, 121.1, 'Piece'); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/ffb21db2/odata2-jpa-processor/jpa-web/src/main/resources/SQL_Insert_SalesOrderHeader.properties ---------------------------------------------------------------------- diff --git a/odata2-jpa-processor/jpa-web/src/main/resources/SQL_Insert_SalesOrderHeader.properties b/odata2-jpa-processor/jpa-web/src/main/resources/SQL_Insert_SalesOrderHeader.properties index 8b519bf..f27abd4 100644 --- a/odata2-jpa-processor/jpa-web/src/main/resources/SQL_Insert_SalesOrderHeader.properties +++ b/odata2-jpa-processor/jpa-web/src/main/resources/SQL_Insert_SalesOrderHeader.properties @@ -1,30 +1,30 @@ -#------------------------------------------------------------------------------- -# 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. -#------------------------------------------------------------------------------- - -query1 = insert into T_SALESORDERHEADER (SO_ID, customer_ID, CURRENCY_CODE, DELIVERY_STATUS, creationDate) values(1, 100, 'INR', '01', '2012-11-01 00:01:00'); -query2 = insert into T_SALESORDERHEADER (SO_ID, customer_ID, CURRENCY_CODE, DELIVERY_STATUS, creationDate) values(2, 100, 'USD', '01', '2013-01-02 00:00:00'); -query3 = insert into T_SALESORDERHEADER (SO_ID, customer_ID, CURRENCY_CODE, DELIVERY_STATUS, creationDate) values(3, 100, 'USD', '02', '2013-01-01 14:00:00'); -query4 = insert into T_SALESORDERHEADER (SO_ID, customer_ID, CURRENCY_CODE, DELIVERY_STATUS, creationDate) values(4, 200, 'INR', '01', '2013-01-02 00:00:00'); -query5 = insert into T_SALESORDERHEADER (SO_ID, customer_ID, CURRENCY_CODE, DELIVERY_STATUS, creationDate) values(5, 201, 'INR', '02', '2013-01-01 14:14:14'); -query6 = insert into T_SALESORDERHEADER (SO_ID, customer_ID, CURRENCY_CODE, DELIVERY_STATUS, creationDate) values(6, 101, 'EUR', '01', '2013-01-02 00:00:00'); -query7 = insert into T_SALESORDERHEADER (SO_ID, customer_ID, CURRENCY_CODE, DELIVERY_STATUS, creationDate) values(7, 201, 'EUR', '02', '2013-01-01 14:14:00'); -query8 = insert into T_SALESORDERHEADER (SO_ID, customer_ID, CURRENCY_CODE, DELIVERY_STATUS, creationDate) values(8, 201, 'GBR', '01', '2013-01-02 00:00:00'); -query9 = insert into T_SALESORDERHEADER (SO_ID, customer_ID, CURRENCY_CODE, DELIVERY_STATUS, creationDate) values(9, 101, 'GBR', '02', '2013-01-01 00:00:00'); -query10 = insert into T_SALESORDERHEADER (SO_ID, customer_ID, CURRENCY_CODE, DELIVERY_STATUS, creationDate) values(10, 100, 'AUD', '01', '2013-01-01 00:00:00'); +#------------------------------------------------------------------------------- +# 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. +#------------------------------------------------------------------------------- + +query1 = insert into T_SALESORDERHEADER (SO_ID, customer_ID, CURRENCY_CODE, DELIVERY_STATUS, creationDate) values(1, 100, 'INR', '01', '2012-11-01 00:01:00'); +query2 = insert into T_SALESORDERHEADER (SO_ID, customer_ID, CURRENCY_CODE, DELIVERY_STATUS, creationDate) values(2, 100, 'USD', '01', '2013-01-02 00:00:00'); +query3 = insert into T_SALESORDERHEADER (SO_ID, customer_ID, CURRENCY_CODE, DELIVERY_STATUS, creationDate) values(3, 100, 'USD', '02', '2013-01-01 14:00:00'); +query4 = insert into T_SALESORDERHEADER (SO_ID, customer_ID, CURRENCY_CODE, DELIVERY_STATUS, creationDate) values(4, 200, 'INR', '01', '2013-01-02 00:00:00'); +query5 = insert into T_SALESORDERHEADER (SO_ID, customer_ID, CURRENCY_CODE, DELIVERY_STATUS, creationDate) values(5, 201, 'INR', '02', '2013-01-01 14:14:14'); +query6 = insert into T_SALESORDERHEADER (SO_ID, customer_ID, CURRENCY_CODE, DELIVERY_STATUS, creationDate) values(6, 101, 'EUR', '01', '2013-01-02 00:00:00'); +query7 = insert into T_SALESORDERHEADER (SO_ID, customer_ID, CURRENCY_CODE, DELIVERY_STATUS, creationDate) values(7, 201, 'EUR', '02', '2013-01-01 14:14:00'); +query8 = insert into T_SALESORDERHEADER (SO_ID, customer_ID, CURRENCY_CODE, DELIVERY_STATUS, creationDate) values(8, 201, 'GBR', '01', '2013-01-02 00:00:00'); +query9 = insert into T_SALESORDERHEADER (SO_ID, customer_ID, CURRENCY_CODE, DELIVERY_STATUS, creationDate) values(9, 101, 'GBR', '02', '2013-01-01 00:00:00'); +query10 = insert into T_SALESORDERHEADER (SO_ID, customer_ID, CURRENCY_CODE, DELIVERY_STATUS, creationDate) values(10, 100, 'AUD', '01', '2013-01-01 00:00:00'); query11 = insert into T_SALESORDERHEADER (SO_ID, customer_ID, CURRENCY_CODE, DELIVERY_STATUS, creationDate) values(11, 202, 'AUD', '02', '2013-01-02 00:00:00'); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/ffb21db2/odata2-jpa-processor/jpa-web/src/main/resources/SQL_Insert_SalesOrderItem.properties ---------------------------------------------------------------------- diff --git a/odata2-jpa-processor/jpa-web/src/main/resources/SQL_Insert_SalesOrderItem.properties b/odata2-jpa-processor/jpa-web/src/main/resources/SQL_Insert_SalesOrderItem.properties index 0cc7669..3c0b221 100644 --- a/odata2-jpa-processor/jpa-web/src/main/resources/SQL_Insert_SalesOrderItem.properties +++ b/odata2-jpa-processor/jpa-web/src/main/resources/SQL_Insert_SalesOrderItem.properties @@ -1,30 +1,30 @@ -#------------------------------------------------------------------------------- -# 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. -#------------------------------------------------------------------------------- - -line_item_query1 = insert into T_SALESORDERITEM (Material_Id , quantity , amount , discount , Sales_Order_Id , Sales_Order_Item_Id, delivered ) values(111, 1, 10.1, 1.11, 3, 11,true); -line_item_query2 = insert into T_SALESORDERITEM (Material_Id , quantity , amount , discount , Sales_Order_Id , Sales_Order_Item_Id, delivered ) values(112, 1, 111.1, 1.12, 2, 10,true); -line_item_query3 = insert into T_SALESORDERITEM (Material_Id , quantity , amount , discount , Sales_Order_Id , Sales_Order_Item_Id, delivered ) values(113, 1, 211.1, 1.13, 3, 9,false); -line_item_query4 = insert into T_SALESORDERITEM (Material_Id , quantity , amount , discount , Sales_Order_Id , Sales_Order_Item_Id, delivered ) values(114, 1, 221.1, 1.14, 4, 8,false); -line_item_query5 = insert into T_SALESORDERITEM (Material_Id , quantity , amount , discount , Sales_Order_Id , Sales_Order_Item_Id, delivered ) values(115, 1, 651.1, 1.15, 5, 7,true); -line_item_query6 = insert into T_SALESORDERITEM (Material_Id , quantity , amount , discount , Sales_Order_Id , Sales_Order_Item_Id, delivered ) values(116, 1, 653.21, 1.16, 6, 6,true); -line_item_query7 = insert into T_SALESORDERITEM (Material_Id , quantity , amount , discount , Sales_Order_Id , Sales_Order_Item_Id, delivered ) values(117, 1, 57.11, 1.17, 7, 5,true); -line_item_query8 = insert into T_SALESORDERITEM (Material_Id , quantity , amount , discount , Sales_Order_Id , Sales_Order_Item_Id, delivered ) values(118, 1, 52.98, 1.18, 8, 4,false); -line_item_query9 = insert into T_SALESORDERITEM (Material_Id , quantity , amount , discount , Sales_Order_Id , Sales_Order_Item_Id, delivered ) values(119, 1, 78.99, 1.19, 9, 3,false); -line_item_query10 = insert into T_SALESORDERITEM (Material_Id , quantity , amount , discount , Sales_Order_Id , Sales_Order_Item_Id, delivered ) values(120, 1,69.23, 1.20, 10, 2,true); -line_item_query11 = insert into T_SALESORDERITEM (Material_Id , quantity , amount , discount , Sales_Order_Id , Sales_Order_Item_Id , delivered) values(121, 1, 356.65, 1.21, 3, 1,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. +#------------------------------------------------------------------------------- + +line_item_query1 = insert into T_SALESORDERITEM (Material_Id , quantity , amount , discount , Sales_Order_Id , Sales_Order_Item_Id, delivered ) values(111, 1, 10.1, 1.11, 3, 11,true); +line_item_query2 = insert into T_SALESORDERITEM (Material_Id , quantity , amount , discount , Sales_Order_Id , Sales_Order_Item_Id, delivered ) values(112, 1, 111.1, 1.12, 2, 10,true); +line_item_query3 = insert into T_SALESORDERITEM (Material_Id , quantity , amount , discount , Sales_Order_Id , Sales_Order_Item_Id, delivered ) values(113, 1, 211.1, 1.13, 3, 9,false); +line_item_query4 = insert into T_SALESORDERITEM (Material_Id , quantity , amount , discount , Sales_Order_Id , Sales_Order_Item_Id, delivered ) values(114, 1, 221.1, 1.14, 4, 8,false); +line_item_query5 = insert into T_SALESORDERITEM (Material_Id , quantity , amount , discount , Sales_Order_Id , Sales_Order_Item_Id, delivered ) values(115, 1, 651.1, 1.15, 5, 7,true); +line_item_query6 = insert into T_SALESORDERITEM (Material_Id , quantity , amount , discount , Sales_Order_Id , Sales_Order_Item_Id, delivered ) values(116, 1, 653.21, 1.16, 6, 6,true); +line_item_query7 = insert into T_SALESORDERITEM (Material_Id , quantity , amount , discount , Sales_Order_Id , Sales_Order_Item_Id, delivered ) values(117, 1, 57.11, 1.17, 7, 5,true); +line_item_query8 = insert into T_SALESORDERITEM (Material_Id , quantity , amount , discount , Sales_Order_Id , Sales_Order_Item_Id, delivered ) values(118, 1, 52.98, 1.18, 8, 4,false); +line_item_query9 = insert into T_SALESORDERITEM (Material_Id , quantity , amount , discount , Sales_Order_Id , Sales_Order_Item_Id, delivered ) values(119, 1, 78.99, 1.19, 9, 3,false); +line_item_query10 = insert into T_SALESORDERITEM (Material_Id , quantity , amount , discount , Sales_Order_Id , Sales_Order_Item_Id, delivered ) values(120, 1,69.23, 1.20, 10, 2,true); +line_item_query11 = insert into T_SALESORDERITEM (Material_Id , quantity , amount , discount , Sales_Order_Id , Sales_Order_Item_Id , delivered) values(121, 1, 356.65, 1.21, 3, 1,true); http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/ffb21db2/odata2-jpa-processor/jpa-web/src/main/resources/SQL_Insert_Store.properties ---------------------------------------------------------------------- diff --git a/odata2-jpa-processor/jpa-web/src/main/resources/SQL_Insert_Store.properties b/odata2-jpa-processor/jpa-web/src/main/resources/SQL_Insert_Store.properties index 20860f2..24d1bce 100644 --- a/odata2-jpa-processor/jpa-web/src/main/resources/SQL_Insert_Store.properties +++ b/odata2-jpa-processor/jpa-web/src/main/resources/SQL_Insert_Store.properties @@ -1,30 +1,30 @@ -#------------------------------------------------------------------------------- -# 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. -#------------------------------------------------------------------------------- - -store_query_1 = insert into T_STORE (STORE_ID , STORE_NAME, HOUSE_NUMBER, STREET_NAME, CITY, COUNTRY, PINCODE) values(131, 'Store New York', 11, 'New York Street', 'New York', 'USA','10001'); -store_query_2 = insert into T_STORE (STORE_ID , STORE_NAME, HOUSE_NUMBER, STREET_NAME, CITY, COUNTRY, PINCODE) values(132, 'Store Bengaluru', 21, 'Whitefield', 'Bengaluru', 'India','560037'); -store_query_3 = insert into T_STORE (STORE_ID , STORE_NAME, HOUSE_NUMBER, STREET_NAME, CITY, COUNTRY, PINCODE) values(133, 'Store Toronto', 31, 'Toronto Street', 'Toronto', 'Canada','M4J'); -store_query_4 = insert into T_STORE (STORE_ID , STORE_NAME, HOUSE_NUMBER, STREET_NAME, CITY, COUNTRY, PINCODE) values(134, 'Store Chicago', 41, 'Chicago Street', 'Chicago', 'USA','60625'); -store_query_5 = insert into T_STORE (STORE_ID , STORE_NAME, HOUSE_NUMBER, STREET_NAME, CITY, COUNTRY, PINCODE) values(135, 'Store Chennai', 51, 'Park Street', 'Chennai', 'India','600021'); -store_query_6 = insert into T_STORE (STORE_ID , STORE_NAME, HOUSE_NUMBER, STREET_NAME, CITY, COUNTRY, PINCODE) values(136, 'Store Frankfurt', 61, 'Frankfurt Street', 'Frankfurt', 'Germany','60001'); -store_query_7 = insert into T_STORE (STORE_ID , STORE_NAME, HOUSE_NUMBER, STREET_NAME, CITY, COUNTRY, PINCODE) values(137, 'Store Berlin', 71, 'Berlin Street', 'Berlin', 'Germany','10115'); -store_query_8 = insert into T_STORE (STORE_ID , STORE_NAME, HOUSE_NUMBER, STREET_NAME, CITY, COUNTRY, PINCODE) values(138, 'Store Hamburg', 81, 'Hamburg Street', 'Hamburg', 'Germany','20001'); -store_query_9 = insert into T_STORE (STORE_ID , STORE_NAME, HOUSE_NUMBER, STREET_NAME, CITY, COUNTRY, PINCODE) values(139, 'Store New Delhi', 91, 'New Delhi Street', 'New Delhi', 'India','110001'); -store_query_10 = insert into T_STORE (STORE_ID , STORE_NAME, HOUSE_NUMBER, STREET_NAME, CITY, COUNTRY, PINCODE) values(140, 'Store Ottawa', 100, 'Ottawa Street', 'Ottawa', 'Canada','K0A'); +#------------------------------------------------------------------------------- +# 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. +#------------------------------------------------------------------------------- + +store_query_1 = insert into T_STORE (STORE_ID , STORE_NAME, HOUSE_NUMBER, STREET_NAME, CITY, COUNTRY, PINCODE) values(131, 'Store New York', 11, 'New York Street', 'New York', 'USA','10001'); +store_query_2 = insert into T_STORE (STORE_ID , STORE_NAME, HOUSE_NUMBER, STREET_NAME, CITY, COUNTRY, PINCODE) values(132, 'Store Bengaluru', 21, 'Whitefield', 'Bengaluru', 'India','560037'); +store_query_3 = insert into T_STORE (STORE_ID , STORE_NAME, HOUSE_NUMBER, STREET_NAME, CITY, COUNTRY, PINCODE) values(133, 'Store Toronto', 31, 'Toronto Street', 'Toronto', 'Canada','M4J'); +store_query_4 = insert into T_STORE (STORE_ID , STORE_NAME, HOUSE_NUMBER, STREET_NAME, CITY, COUNTRY, PINCODE) values(134, 'Store Chicago', 41, 'Chicago Street', 'Chicago', 'USA','60625'); +store_query_5 = insert into T_STORE (STORE_ID , STORE_NAME, HOUSE_NUMBER, STREET_NAME, CITY, COUNTRY, PINCODE) values(135, 'Store Chennai', 51, 'Park Street', 'Chennai', 'India','600021'); +store_query_6 = insert into T_STORE (STORE_ID , STORE_NAME, HOUSE_NUMBER, STREET_NAME, CITY, COUNTRY, PINCODE) values(136, 'Store Frankfurt', 61, 'Frankfurt Street', 'Frankfurt', 'Germany','60001'); +store_query_7 = insert into T_STORE (STORE_ID , STORE_NAME, HOUSE_NUMBER, STREET_NAME, CITY, COUNTRY, PINCODE) values(137, 'Store Berlin', 71, 'Berlin Street', 'Berlin', 'Germany','10115'); +store_query_8 = insert into T_STORE (STORE_ID , STORE_NAME, HOUSE_NUMBER, STREET_NAME, CITY, COUNTRY, PINCODE) values(138, 'Store Hamburg', 81, 'Hamburg Street', 'Hamburg', 'Germany','20001'); +store_query_9 = insert into T_STORE (STORE_ID , STORE_NAME, HOUSE_NUMBER, STREET_NAME, CITY, COUNTRY, PINCODE) values(139, 'Store New Delhi', 91, 'New Delhi Street', 'New Delhi', 'India','110001'); +store_query_10 = insert into T_STORE (STORE_ID , STORE_NAME, HOUSE_NUMBER, STREET_NAME, CITY, COUNTRY, PINCODE) values(140, 'Store Ottawa', 100, 'Ottawa Street', 'Ottawa', 'Canada','K0A'); store_query_11 = insert into T_STORE (STORE_ID , STORE_NAME, HOUSE_NUMBER, STREET_NAME, CITY, COUNTRY, PINCODE) values(141, 'Store Kolkata', 101, 'Kolkata Street', 'Kolkata', 'India','310001'); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/ffb21db2/odata2-jpa-processor/jpa-web/src/main/resources/serviceConfig.properties ---------------------------------------------------------------------- diff --git a/odata2-jpa-processor/jpa-web/src/main/resources/serviceConfig.properties b/odata2-jpa-processor/jpa-web/src/main/resources/serviceConfig.properties index 747277e..774b83a 100644 --- a/odata2-jpa-processor/jpa-web/src/main/resources/serviceConfig.properties +++ b/odata2-jpa-processor/jpa-web/src/main/resources/serviceConfig.properties @@ -1,19 +1,19 @@ -#------------------------------------------------------------------------------- -# 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. -#------------------------------------------------------------------------------- +#------------------------------------------------------------------------------- +# 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. +#------------------------------------------------------------------------------- showDetailError=true \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/ffb21db2/odata2-jpa-processor/jpa-web/src/main/webapp/WEB-INF/web.xml ---------------------------------------------------------------------- diff --git a/odata2-jpa-processor/jpa-web/src/main/webapp/WEB-INF/web.xml b/odata2-jpa-processor/jpa-web/src/main/webapp/WEB-INF/web.xml index df2bba0..cffa37e 100644 --- a/odata2-jpa-processor/jpa-web/src/main/webapp/WEB-INF/web.xml +++ b/odata2-jpa-processor/jpa-web/src/main/webapp/WEB-INF/web.xml @@ -18,30 +18,30 @@ under the License. --> -<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns="http://java.sun.com/xml/ns/javaee"; xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"; - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"; - id="WebApp_ID" version="2.5"> - <display-name>OData - JPA Reference</display-name> - <welcome-file-list> - <welcome-file>index.jsp</welcome-file> - </welcome-file-list> - - <servlet> - <servlet-name>JPARefScenarioServlet</servlet-name> - <servlet-class>org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet</servlet-class> - <init-param> - <param-name>javax.ws.rs.Application</param-name> - <param-value>org.apache.olingo.odata2.core.rest.app.ODataApplication</param-value> - </init-param> - <init-param> - <param-name>org.apache.olingo.odata2.service.factory</param-name> - <param-value>org.apache.olingo.odata2.jpa.processor.ref.web.JPAReferenceServiceFactory</param-value> - </init-param> - <load-on-startup>1</load-on-startup> - </servlet> - <servlet-mapping> - <servlet-name>JPARefScenarioServlet</servlet-name> - <url-pattern>/SalesOrderProcessing.svc/*</url-pattern> - </servlet-mapping> -</web-app> +<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xmlns="http://java.sun.com/xml/ns/javaee"; xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"; + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"; + id="WebApp_ID" version="2.5"> + <display-name>OData - JPA Reference</display-name> + <welcome-file-list> + <welcome-file>index.jsp</welcome-file> + </welcome-file-list> + + <servlet> + <servlet-name>JPARefScenarioServlet</servlet-name> + <servlet-class>org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet</servlet-class> + <init-param> + <param-name>javax.ws.rs.Application</param-name> + <param-value>org.apache.olingo.odata2.core.rest.app.ODataApplication</param-value> + </init-param> + <init-param> + <param-name>org.apache.olingo.odata2.service.factory</param-name> + <param-value>org.apache.olingo.odata2.jpa.processor.ref.web.JPAReferenceServiceFactory</param-value> + </init-param> + <load-on-startup>1</load-on-startup> + </servlet> + <servlet-mapping> + <servlet-name>JPARefScenarioServlet</servlet-name> + <url-pattern>/SalesOrderProcessing.svc/*</url-pattern> + </servlet-mapping> +</web-app> http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/ffb21db2/odata2-jpa-processor/jpa-web/src/main/webapp/index.jsp ---------------------------------------------------------------------- diff --git a/odata2-jpa-processor/jpa-web/src/main/webapp/index.jsp b/odata2-jpa-processor/jpa-web/src/main/webapp/index.jsp index db37577..0885ad0 100644 --- a/odata2-jpa-processor/jpa-web/src/main/webapp/index.jsp +++ b/odata2-jpa-processor/jpa-web/src/main/webapp/index.jsp @@ -1,332 +1,332 @@ -<!-- - 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. ---> -<%@page - import="org.apache.olingo.odata2.jpa.processor.ref.factory.JPAEntityManagerFactory"%> -<%@page import="java.util.List"%> -<%@page import="javax.persistence.EntityManager"%> -<%@page import="javax.persistence.EntityManagerFactory"%> -<%@page import="javax.persistence.Persistence"%> -<%@page import="javax.persistence.Query"%> -<%@page - import="org.apache.olingo.odata2.jpa.processor.ref.web.JPAReferenceServiceFactory"%> -<%@page - import="org.apache.olingo.odata2.jpa.processor.ref.util.DataGenerator"%> - -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd";> -<html> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<title>Apache Olingo - OData2 JPA Processor Library</title> -<style type="text/css"> -body { - font-family: Arial, sans-serif; - font-size: 13px; - line-height: 18px; - color: blue; - background-color: #ffffff; -} - -a { - color: blue; - text-decoration: none; -} - -a:focus { - outline: thin dotted #4076cb; - outline-offset: -1px; -} - -a:hover,a:active { - outline: 0; -} - -a:hover { - color: #404a7e; - text-decoration: underline; -} - -h1,h2,h3,h4,h5,h6 { - margin: 9px 0; - font-family: inherit; - font-weight: bold; - line-height: 1; - color: blue; -} - -h1 { - font-size: 36px; - line-height: 40px; -} - -h2 { - font-size: 30px; - line-height: 40px; -} - -h3 { - font-size: 24px; - line-height: 40px; -} - -h4 { - font-size: 18px; - line-height: 20px; -} - -h5 { - font-size: 14px; - line-height: 20px; -} - -h6 { - font-size: 12px; - line-height: 20px; -} - -.logo { - float: right; -} - -ul { - padding: 0; - margin: 0 0 9px 25px; -} - -ul ul { - margin-bottom: 0; -} - -li { - line-height: 18px; -} - -hr { - margin: 18px 0; - border: 0; - border-top: 1px solid #cccccc; - border-bottom: 1px solid #ffffff; -} - -table { - border-collapse: collapse; - border-spacing: 10px; - border: 0px; -} - -th,td { - border: 0px solid; - padding: 20px; -} - -.code { - font-family: "Courier New", monospace; - font-size: 13px; - line-height: 18px; -} -</style> -</head> -<body> - <h1>Apache Olingo - OData2 JPA Processor Library</h1> - <hr /> - <table width=100% cellspacing="1" cellpadding="1"> - <tr> - <td width=50%><h2>Reference Scenario</h2></td> - <td width="50%"> - <table cellspacing="1" cellpadding="1"> - <tr align="center"> - <td align="right" width="80%"><font color="green"><small> - <% - EntityManagerFactory entityManagerFactory = - JPAEntityManagerFactory.getEntityManagerFactory("salesorderprocessing"); - EntityManager entityManager = entityManagerFactory - .createEntityManager(); - System.out.println("Data Gen " + entityManager.hashCode()); - DataGenerator dataGenerator = new DataGenerator(entityManager); - - Number result1 = null; - Number existingCount = null; - - String msg = null; - if (request.getParameter("button") != null) { - if (request.getParameter("button").equalsIgnoreCase("Generate")) { - Query q = entityManager - .createQuery("SELECT COUNT(x) FROM SalesOrderHeader x"); - existingCount = (Number) q.getSingleResult(); - if (existingCount.intValue() < 10) { // Generate only if no data! - dataGenerator.generate(); - result1 = (Number) q.getSingleResult(); - System.out - .println("Data not existing earlier.... Generated number of Items - " - + result1); - msg = result1 + " items generated. "; - - } else { - System.err - .println("Data already existing.... No Item generated by Data Generator !!"); - msg = "Data exists. No Item generated !!"; - } - } else { //Clean - - // Check if data already exists - Query q = entityManager - .createQuery("SELECT COUNT(x) FROM SalesOrderHeader x"); - Number result = (Number) q.getSingleResult(); - if (result.intValue() > 0) { // Generate only if no data! - dataGenerator.clean(); - msg = "Data Cleaned. " + result + " items cleaned."; - } else { - msg = " Nothing to clean!!"; - } - } - %> <%=(msg)%> - </small> </font></td> - <% - } - %> - <td width="10%"> - <form name="form1" method="get"> - <input type="hidden" name="button" value="Generate"> <input - type="submit" value="Generate Data" width="100%"> - </form> - </td> - <td width="10%"> - - <form name="form2" method="get"> - <input type="hidden" name="button" value="Clean"> <input - type="submit" value=" Clean Data " width="100%"> - </form> - </td> - </tr> - </table> - </td> - </tr> - </table> - <table width=100%> - <tr> - <td valign="top"> - <h3>Service Document and Metadata</h3> - <ul> - <li><a href="SalesOrderProcessing.svc?_wadl" target="_blank">wadl</a></li> - <li><a href="SalesOrderProcessing.svc/" target="_blank">service - document</a></li> - <li><a href="SalesOrderProcessing.svc/$metadata" - target="_blank">metadata</a></li> - </ul> - <h3>EntitySets</h3> - <ul> - <li><a href="SalesOrderProcessing.svc/SalesOrders" - target="_blank">SalesOrders</a></li> - <li><a href="SalesOrderProcessing.svc/SalesOrderLineItems" - target="_blank">SalesOrderLineItems</a></li> - <li><a href="SalesOrderProcessing.svc/Materials" - target="_blank">Materials</a></li> - <li><a href="SalesOrderProcessing.svc/Stores" target="_blank">Stores</a></li> - </ul> - <h3>Entities</h3> - <ul> - <li><a href="SalesOrderProcessing.svc/SalesOrders(2L)" - target="_blank">SalesOrders(2L)</a></li> - <li><a - href="SalesOrderProcessing.svc/SalesOrderLineItems(LiId=10L,SoId=2L)" - target="_blank">SalesOrderLineItems(LiId=10L,SoId=2L)</a></li> - <li><a href="SalesOrderProcessing.svc/Materials(111L)" - target="_blank">Materials(111L)</a></li> - <li><a href="SalesOrderProcessing.svc/Stores(131L)" - target="_blank">Stores(131L)</a></li> - - </ul> - <h3>Navigation</h3> - <ul> - <li><a - href="SalesOrderProcessing.svc/SalesOrders(2L)/SalesOrderLineItemDetails" - target="_blank">SalesOrders(2L)/SalesOrderLineItemDetails</a></li> - <li><a - href="SalesOrderProcessing.svc/SalesOrders(2L)/SalesOrderLineItemDetails" - target="_blank">SalesOrders(2L)/SalesOrderLineItemDetails</a></li> - <li><a - href="SalesOrderProcessing.svc/SalesOrderLineItems(LiId=10L,SoId=2L)/MaterialDetails" - target="_blank">SalesOrderLineItems(LiId=10L,SoId=2L)/MaterialDetails</a></li> - <li><a - href="SalesOrderProcessing.svc/Materials(112L)/StoreDetails" - target="_blank">Materials(112L)/StoreDetails</a></li> - - </ul> - <h3>$expand</h3> - <ul> - <li><a - href="SalesOrderProcessing.svc/SalesOrders?$expand=SalesOrderLineItemDetails" - target="_blank">SalesOrders?$expand=SalesOrderLineItemDetails</a></li> - <li><a - href="SalesOrderProcessing.svc/SalesOrders(2L)?$expand=SalesOrderLineItemDetails" - target="_blank">SalesOrders(2L)?$expand=SalesOrderLineItemDetails</a></li> - <li><a - href="SalesOrderProcessing.svc/SalesOrders?$expand=SalesOrderLineItemDetails/MaterialDetails,SalesOrderLineItemDetails/MaterialDetails/StoreDetails,NotesDetails" - target="_blank">SalesOrders?$expand=SalesOrderLineItemDetails/MaterialDetails,SalesOrderLineItemDetails/MaterialDetails/StoreDetails,NotesDetails</a></li> - <li><a - href="SalesOrderProcessing.svc/SalesOrders(2L)?$expand=SalesOrderLineItemDetails/MaterialDetails,SalesOrderLineItemDetails/MaterialDetails/StoreDetails,NotesDetails" - target="_blank">SalesOrders(2L)?$expand=SalesOrderLineItemDetails/MaterialDetails,SalesOrderLineItemDetails/MaterialDetails/StoreDetails,NotesDetails</a></li> - - </ul> - <h3>Function Imports</h3> - <ul> - <li><a - href="SalesOrderProcessing.svc/FindAllSalesOrders?DeliveryStatusCode='01'" - target="_blank">SalesOrderProcessing.svc/FindAllSalesOrders?DeliveryStatusCode='01'</a></li> - <li><a href="SalesOrderProcessing.svc/orderValue?SoId=2L" - target="_blank">SalesOrderProcessing.svc/orderValue?SoId=2L</a></li> - </ul> - <h3>Paging</h3> - <ul> - <li><a - href="SalesOrderProcessing.svc/SalesOrders?$top=1&$inlinecount=allpages" - target="_blank">SalesOrderProcessing.svc/SalesOrders?$top=1&$inlinecount=allpages"</a></li> - <li><a - href="SalesOrderProcessing.svc/SalesOrders?$top=1&$inlinecount=allpages&$skiptoken=5" - target="_blank">SalesOrderProcessing.svc/SalesOrders?$top=1&$inlinecount=allpages&$skiptoken=5</a></li> - <li><a - href="SalesOrderProcessing.svc/SalesOrders?$top=1&$skip=4&$inlinecount=allpages&$skiptoken=5" - target="_blank">SalesOrderProcessing.svc/SalesOrders?$top=1&$skip=4&$inlinecount=allpages&$skiptoken=5</a></li> - </ul> - </td> - <td valign="top"> </td> - <td valign="bottom"> - <div class="code"> - <% - String version = "gen/version.html"; - %> - <% - try { - %> - <jsp:include page='<%=version%>' /> - <% - } catch (Exception e) { - %> - <p>IDE Build</p> - <% - } - %> - </div> - </td> - </tr> - </table> -</body> -</html> - +<!-- + 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. +--> +<%@page + import="org.apache.olingo.odata2.jpa.processor.ref.factory.JPAEntityManagerFactory"%> +<%@page import="java.util.List"%> +<%@page import="javax.persistence.EntityManager"%> +<%@page import="javax.persistence.EntityManagerFactory"%> +<%@page import="javax.persistence.Persistence"%> +<%@page import="javax.persistence.Query"%> +<%@page + import="org.apache.olingo.odata2.jpa.processor.ref.web.JPAReferenceServiceFactory"%> +<%@page + import="org.apache.olingo.odata2.jpa.processor.ref.util.DataGenerator"%> + +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd";> +<html> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> +<title>Apache Olingo - OData2 JPA Processor Library</title> +<style type="text/css"> +body { + font-family: Arial, sans-serif; + font-size: 13px; + line-height: 18px; + color: blue; + background-color: #ffffff; +} + +a { + color: blue; + text-decoration: none; +} + +a:focus { + outline: thin dotted #4076cb; + outline-offset: -1px; +} + +a:hover,a:active { + outline: 0; +} + +a:hover { + color: #404a7e; + text-decoration: underline; +} + +h1,h2,h3,h4,h5,h6 { + margin: 9px 0; + font-family: inherit; + font-weight: bold; + line-height: 1; + color: blue; +} + +h1 { + font-size: 36px; + line-height: 40px; +} + +h2 { + font-size: 30px; + line-height: 40px; +} + +h3 { + font-size: 24px; + line-height: 40px; +} + +h4 { + font-size: 18px; + line-height: 20px; +} + +h5 { + font-size: 14px; + line-height: 20px; +} + +h6 { + font-size: 12px; + line-height: 20px; +} + +.logo { + float: right; +} + +ul { + padding: 0; + margin: 0 0 9px 25px; +} + +ul ul { + margin-bottom: 0; +} + +li { + line-height: 18px; +} + +hr { + margin: 18px 0; + border: 0; + border-top: 1px solid #cccccc; + border-bottom: 1px solid #ffffff; +} + +table { + border-collapse: collapse; + border-spacing: 10px; + border: 0px; +} + +th,td { + border: 0px solid; + padding: 20px; +} + +.code { + font-family: "Courier New", monospace; + font-size: 13px; + line-height: 18px; +} +</style> +</head> +<body> + <h1>Apache Olingo - OData2 JPA Processor Library</h1> + <hr /> + <table width=100% cellspacing="1" cellpadding="1"> + <tr> + <td width=50%><h2>Reference Scenario</h2></td> + <td width="50%"> + <table cellspacing="1" cellpadding="1"> + <tr align="center"> + <td align="right" width="80%"><font color="green"><small> + <% + EntityManagerFactory entityManagerFactory = + JPAEntityManagerFactory.getEntityManagerFactory("salesorderprocessing"); + EntityManager entityManager = entityManagerFactory + .createEntityManager(); + System.out.println("Data Gen " + entityManager.hashCode()); + DataGenerator dataGenerator = new DataGenerator(entityManager); + + Number result1 = null; + Number existingCount = null; + + String msg = null; + if (request.getParameter("button") != null) { + if (request.getParameter("button").equalsIgnoreCase("Generate")) { + Query q = entityManager + .createQuery("SELECT COUNT(x) FROM SalesOrderHeader x"); + existingCount = (Number) q.getSingleResult(); + if (existingCount.intValue() < 10) { // Generate only if no data! + dataGenerator.generate(); + result1 = (Number) q.getSingleResult(); + System.out + .println("Data not existing earlier.... Generated number of Items - " + + result1); + msg = result1 + " items generated. "; + + } else { + System.err + .println("Data already existing.... No Item generated by Data Generator !!"); + msg = "Data exists. No Item generated !!"; + } + } else { //Clean + + // Check if data already exists + Query q = entityManager + .createQuery("SELECT COUNT(x) FROM SalesOrderHeader x"); + Number result = (Number) q.getSingleResult(); + if (result.intValue() > 0) { // Generate only if no data! + dataGenerator.clean(); + msg = "Data Cleaned. " + result + " items cleaned."; + } else { + msg = " Nothing to clean!!"; + } + } + %> <%=(msg)%> + </small> </font></td> + <% + } + %> + <td width="10%"> + <form name="form1" method="get"> + <input type="hidden" name="button" value="Generate"> <input + type="submit" value="Generate Data" width="100%"> + </form> + </td> + <td width="10%"> + + <form name="form2" method="get"> + <input type="hidden" name="button" value="Clean"> <input + type="submit" value=" Clean Data " width="100%"> + </form> + </td> + </tr> + </table> + </td> + </tr> + </table> + <table width=100%> + <tr> + <td valign="top"> + <h3>Service Document and Metadata</h3> + <ul> + <li><a href="SalesOrderProcessing.svc?_wadl" target="_blank">wadl</a></li> + <li><a href="SalesOrderProcessing.svc/" target="_blank">service + document</a></li> + <li><a href="SalesOrderProcessing.svc/$metadata" + target="_blank">metadata</a></li> + </ul> + <h3>EntitySets</h3> + <ul> + <li><a href="SalesOrderProcessing.svc/SalesOrders" + target="_blank">SalesOrders</a></li> + <li><a href="SalesOrderProcessing.svc/SalesOrderLineItems" + target="_blank">SalesOrderLineItems</a></li> + <li><a href="SalesOrderProcessing.svc/Materials" + target="_blank">Materials</a></li> + <li><a href="SalesOrderProcessing.svc/Stores" target="_blank">Stores</a></li> + </ul> + <h3>Entities</h3> + <ul> + <li><a href="SalesOrderProcessing.svc/SalesOrders(2L)" + target="_blank">SalesOrders(2L)</a></li> + <li><a + href="SalesOrderProcessing.svc/SalesOrderLineItems(LiId=10L,SoId=2L)" + target="_blank">SalesOrderLineItems(LiId=10L,SoId=2L)</a></li> + <li><a href="SalesOrderProcessing.svc/Materials(111L)" + target="_blank">Materials(111L)</a></li> + <li><a href="SalesOrderProcessing.svc/Stores(131L)" + target="_blank">Stores(131L)</a></li> + + </ul> + <h3>Navigation</h3> + <ul> + <li><a + href="SalesOrderProcessing.svc/SalesOrders(2L)/SalesOrderLineItemDetails" + target="_blank">SalesOrders(2L)/SalesOrderLineItemDetails</a></li> + <li><a + href="SalesOrderProcessing.svc/SalesOrders(2L)/SalesOrderLineItemDetails" + target="_blank">SalesOrders(2L)/SalesOrderLineItemDetails</a></li> + <li><a + href="SalesOrderProcessing.svc/SalesOrderLineItems(LiId=10L,SoId=2L)/MaterialDetails" + target="_blank">SalesOrderLineItems(LiId=10L,SoId=2L)/MaterialDetails</a></li> + <li><a + href="SalesOrderProcessing.svc/Materials(112L)/StoreDetails" + target="_blank">Materials(112L)/StoreDetails</a></li> + + </ul> + <h3>$expand</h3> + <ul> + <li><a + href="SalesOrderProcessing.svc/SalesOrders?$expand=SalesOrderLineItemDetails" + target="_blank">SalesOrders?$expand=SalesOrderLineItemDetails</a></li> + <li><a + href="SalesOrderProcessing.svc/SalesOrders(2L)?$expand=SalesOrderLineItemDetails" + target="_blank">SalesOrders(2L)?$expand=SalesOrderLineItemDetails</a></li> + <li><a + href="SalesOrderProcessing.svc/SalesOrders?$expand=SalesOrderLineItemDetails/MaterialDetails,SalesOrderLineItemDetails/MaterialDetails/StoreDetails,NotesDetails" + target="_blank">SalesOrders?$expand=SalesOrderLineItemDetails/MaterialDetails,SalesOrderLineItemDetails/MaterialDetails/StoreDetails,NotesDetails</a></li> + <li><a + href="SalesOrderProcessing.svc/SalesOrders(2L)?$expand=SalesOrderLineItemDetails/MaterialDetails,SalesOrderLineItemDetails/MaterialDetails/StoreDetails,NotesDetails" + target="_blank">SalesOrders(2L)?$expand=SalesOrderLineItemDetails/MaterialDetails,SalesOrderLineItemDetails/MaterialDetails/StoreDetails,NotesDetails</a></li> + + </ul> + <h3>Function Imports</h3> + <ul> + <li><a + href="SalesOrderProcessing.svc/FindAllSalesOrders?DeliveryStatusCode='01'" + target="_blank">SalesOrderProcessing.svc/FindAllSalesOrders?DeliveryStatusCode='01'</a></li> + <li><a href="SalesOrderProcessing.svc/orderValue?SoId=2L" + target="_blank">SalesOrderProcessing.svc/orderValue?SoId=2L</a></li> + </ul> + <h3>Paging</h3> + <ul> + <li><a + href="SalesOrderProcessing.svc/SalesOrders?$top=1&$inlinecount=allpages" + target="_blank">SalesOrderProcessing.svc/SalesOrders?$top=1&$inlinecount=allpages"</a></li> + <li><a + href="SalesOrderProcessing.svc/SalesOrders?$top=1&$inlinecount=allpages&$skiptoken=5" + target="_blank">SalesOrderProcessing.svc/SalesOrders?$top=1&$inlinecount=allpages&$skiptoken=5</a></li> + <li><a + href="SalesOrderProcessing.svc/SalesOrders?$top=1&$skip=4&$inlinecount=allpages&$skiptoken=5" + target="_blank">SalesOrderProcessing.svc/SalesOrders?$top=1&$skip=4&$inlinecount=allpages&$skiptoken=5</a></li> + </ul> + </td> + <td valign="top"> </td> + <td valign="bottom"> + <div class="code"> + <% + String version = "gen/version.html"; + %> + <% + try { + %> + <jsp:include page='<%=version%>' /> + <% + } catch (Exception e) { + %> + <p>IDE Build</p> + <% + } + %> + </div> + </td> + </tr> + </table> +</body> +</html> + http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/ffb21db2/odata2-lib/odata-annotation/.gitignore ---------------------------------------------------------------------- diff --git a/odata2-lib/odata-annotation/.gitignore b/odata2-lib/odata-annotation/.gitignore index 8b3fd61..29be3de 100644 --- a/odata2-lib/odata-annotation/.gitignore +++ b/odata2-lib/odata-annotation/.gitignore @@ -1,8 +1,8 @@ -.project -.classpath -.settings -target -bin -*.bak -classes -.DS_Store +.project +.classpath +.settings +target +bin +*.bak +classes +.DS_Store http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/ffb21db2/odata2-lib/odata-annotation/src/main/java/META-INF/MANIFEST.MF ---------------------------------------------------------------------- diff --git a/odata2-lib/odata-annotation/src/main/java/META-INF/MANIFEST.MF b/odata2-lib/odata-annotation/src/main/java/META-INF/MANIFEST.MF index 5e94951..254272e 100644 --- a/odata2-lib/odata-annotation/src/main/java/META-INF/MANIFEST.MF +++ b/odata2-lib/odata-annotation/src/main/java/META-INF/MANIFEST.MF @@ -1,3 +1,3 @@ -Manifest-Version: 1.0 -Class-Path: - +Manifest-Version: 1.0 +Class-Path: +
