Author: echatellier Date: 2012-01-12 10:11:23 +0100 (Thu, 12 Jan 2012) New Revision: 155 Url: http://chorem.org/repositories/revision/vradi/155 Log: Use cajo configuration Modified: trunk/vradi-services/src/main/java/org/chorem/vradi/services/VradiServiceContext.java trunk/vradi-services/src/main/java/org/chorem/vradi/services/VradiServiceFactory.java Modified: trunk/vradi-services/src/main/java/org/chorem/vradi/services/VradiServiceContext.java =================================================================== --- trunk/vradi-services/src/main/java/org/chorem/vradi/services/VradiServiceContext.java 2012-01-12 09:11:13 UTC (rev 154) +++ trunk/vradi-services/src/main/java/org/chorem/vradi/services/VradiServiceContext.java 2012-01-12 09:11:23 UTC (rev 155) @@ -1,3 +1,26 @@ +/* + * #%L + * Vradi :: Services + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 Codelutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package org.chorem.vradi.services; import org.apache.commons.logging.Log; Modified: trunk/vradi-services/src/main/java/org/chorem/vradi/services/VradiServiceFactory.java =================================================================== --- trunk/vradi-services/src/main/java/org/chorem/vradi/services/VradiServiceFactory.java 2012-01-12 09:11:13 UTC (rev 154) +++ trunk/vradi-services/src/main/java/org/chorem/vradi/services/VradiServiceFactory.java 2012-01-12 09:11:23 UTC (rev 155) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 Codelutin + * Copyright (C) 2009 - 2012 Codelutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -23,6 +23,8 @@ */ package org.chorem.vradi.services; +import gnu.cajo.utils.extra.TransparentItemProxy; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.vradi.VradiServiceConfigurationHelper; @@ -30,8 +32,6 @@ import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.WikittyService; -import com.caucho.hessian.client.HessianProxyFactory; - /** * VradiServiceFactory. * @@ -67,7 +67,7 @@ try { - /* String cajoEndPoint = serviceEndpoint; + String cajoEndPoint = serviceEndpoint; // cajo url is not http or other protocol, url must start with // // example: //localhost:1198/ws // remove protocol @@ -79,10 +79,10 @@ serviceEndpoint = getServiceURL(cajoEndPoint, servicePort, VradiStorageService.VRADI_SERVICE); result = (VradiStorageService) TransparentItemProxy.getItem( - serviceEndpoint, new Class[]{VradiStorageService.class});*/ + serviceEndpoint, new Class[]{VradiStorageService.class}); - HessianProxyFactory factory = new HessianProxyFactory(); + /*HessianProxyFactory factory = new HessianProxyFactory(); // Fix : com.caucho.hessian.io.HessianProtocolException: '���' is an unknown code factory.setHessian2Request(true); // pour que les méthodes aux noms dupliquées fonctionnent (arguments different) @@ -91,7 +91,7 @@ // vradi service result = (VradiStorageService) factory. create(VradiStorageService.class, - getServiceURL(serviceEndpoint, 0, VradiStorageService.VRADI_SERVICE)); + getServiceURL(serviceEndpoint, 0, VradiStorageService.VRADI_SERVICE));*/ } catch (Exception eee) { if (log.isErrorEnabled()) {