You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by mi...@apache.org on 2014/03/16 10:06:06 UTC
[17/50] [abbrv] git commit: [OLINGO-142] Merge branch
'Olingo-142-EnableOsgiJanos'
[OLINGO-142] Merge branch 'Olingo-142-EnableOsgiJanos'
Project: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/commit/3613c171
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/tree/3613c171
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/diff/3613c171
Branch: refs/heads/Olingo-129_PocJpaDataStore
Commit: 3613c171679aa23a5134001954635483d6c752c1
Parents: 8ff7807 a02c14e
Author: Michael Bolz <mi...@apache.org>
Authored: Tue Feb 11 08:14:31 2014 +0100
Committer: Michael Bolz <mi...@apache.org>
Committed: Tue Feb 11 08:21:50 2014 +0100
----------------------------------------------------------------------
.../annotation-processor-api/pom.xml | 42 +++++++++++++
.../processor/api/AnnotationServiceFactory.java | 2 +-
.../annotation-processor-core/pom.xml | 43 ++++++++++++-
.../core/AnnotationServiceFactoryImpl.java | 63 -------------------
.../core/datasource/AnnotationInMemoryDs.java | 26 ++++----
.../processor/core/datasource/DataStore.java | 6 +-
.../core/edm/AnnotationEdmProvider.java | 15 +++--
.../core/rt/AnnotationServiceFactoryImpl.java | 64 ++++++++++++++++++++
.../processor/core/util/AnnotationHelper.java | 19 +++---
.../core/util/AnnotationRuntimeException.java | 40 ++++++++++++
.../processor/core/util/ClassHelper.java | 10 ++-
.../core/AnnotationServiceFactoryImplTest.java | 1 +
.../datasource/AnnotationsInMemoryDsTest.java | 10 +--
.../core/edm/AnnotationEdmProviderTest.java | 2 +-
.../core/util/AnnotationHelperTest.java | 3 +-
.../annotation-processor-ref/pom.xml | 38 ++++++++++++
odata2-lib/odata-annotation/pom.xml | 41 +++++++++++++
17 files changed, 312 insertions(+), 113 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/3613c171/odata2-annotation-processor/annotation-processor-core/pom.xml
----------------------------------------------------------------------
diff --cc odata2-annotation-processor/annotation-processor-core/pom.xml
index 8ed093e,1997352..b12361d
--- a/odata2-annotation-processor/annotation-processor-core/pom.xml
+++ b/odata2-annotation-processor/annotation-processor-core/pom.xml
@@@ -40,6 -80,9 +80,7 @@@
<artifactId>olingo-odata2-api-incubating</artifactId>
<version>${project.version}</version>
</dependency>
- <!--
- -->
+ <!-- Test dependencies -->
<dependency>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-core-incubating</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/3613c171/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/util/AnnotationRuntimeException.java
----------------------------------------------------------------------
diff --cc odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/util/AnnotationRuntimeException.java
index 0000000,b558719..92183c5
mode 000000,100644..100644
--- a/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/util/AnnotationRuntimeException.java
+++ b/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/util/AnnotationRuntimeException.java
@@@ -1,0 -1,37 +1,40 @@@
+ /*******************************************************************************
+ * 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.
+ ******************************************************************************/
+ package org.apache.olingo.odata2.annotation.processor.core.util;
+
++/**
++ * Uncatched exception for cases where an unexpected or unrecoverable error occurs.
++ */
+ public class AnnotationRuntimeException extends RuntimeException {
+
- /** */
++ /** Manual generated */
+ private static final long serialVersionUID = 42L;
+
+ public AnnotationRuntimeException(String message) {
+ super(message);
+ }
+
+ public AnnotationRuntimeException(Throwable cause) {
+ super(cause);
+ }
+
+ public AnnotationRuntimeException(String message, Throwable cause) {
+ super(message, cause);
+ }
+ }