Move to the root the bundles which will be part of v1.4 and v2.2

[lgpl/argeo-commons.git] / server / runtime / org.argeo.server.json / src / main / java / org / argeo / server / json / JsonObjectFactoryImpl.java

diff --git a/server/runtime/org.argeo.server.json/src/main/java/org/argeo/server/json/JsonObjectFactoryImpl.java b/server/runtime/org.argeo.server.json/src/main/java/org/argeo/server/json/JsonObjectFactoryImpl.java
index 40e197e02c624c5c41da21241ee8f12be204605c..4ed46c51ce25a7c8fbaa0d1c1f95cdad67d85780 100644 (file)
--- a/server/runtime/org.argeo.server.json/src/main/java/org/argeo/server/json/JsonObjectFactoryImpl.java
+++ b/server/runtime/org.argeo.server.json/src/main/java/org/argeo/server/json/JsonObjectFactoryImpl.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2007-2012 Argeo GmbH
+ *
+ * Licensed 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.argeo.server.json;
 
 import java.util.HashMap;
@@ -5,7 +20,7 @@ import java.util.Map;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.argeo.server.ArgeoServerException;
+import org.argeo.ArgeoException;
 import org.codehaus.jackson.map.ObjectMapper;
 import org.osgi.framework.BundleContext;
 import org.springframework.beans.factory.InitializingBean;
@@ -38,13 +53,13 @@ public class JsonObjectFactoryImpl implements JsonObjectFactory,
                else {
                        clss = loadClass(type);
                        if (clss == null)
-                               throw new ArgeoServerException("Cannot find type " + type);
+                               throw new ArgeoException("Cannot find type " + type);
                }
 
                try {
                        return (T) objectMapper.readValue(str, clss);
                } catch (Exception e) {
-                       throw new ArgeoServerException("Cannot deserialize " + str
+                       throw new ArgeoException("Cannot deserialize " + str
                                        + " (type=" + type + ")", e);
                }
        }