[Openproj-commitlog] openproj_core/src/com/projity/session SessionFactory.java, 1.2, 1.3
Open Source desktop project management
Brought to you by:
akheirol
From: l <sur...@us...> - 2008-11-26 17:47:46
|
Update of /cvsroot/openproj/openproj_core/src/com/projity/session In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv5585/src/com/projity/session Modified Files: SessionFactory.java Log Message: Index: SessionFactory.java =================================================================== RCS file: /cvsroot/openproj/openproj_core/src/com/projity/session/SessionFactory.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- SessionFactory.java 21 Oct 2008 23:36:34 -0000 1.2 +++ SessionFactory.java 26 Nov 2008 17:47:39 -0000 1.3 @@ -1,51 +1,51 @@ /* -The contents of this file are subject to the Common Public Attribution License -Version 1.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.projity.com/license . The License is based on the Mozilla Public -License Version 1.1 but Sections 14 and 15 have been added to cover use of -software over a computer network and provide for limited attribution for the -Original Developer. In addition, Exhibit A has been modified to be consistent +The contents of this file are subject to the Common Public Attribution License +Version 1.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.projity.com/license . The License is based on the Mozilla Public +License Version 1.1 but Sections 14 and 15 have been added to cover use of +software over a computer network and provide for limited attribution for the +Original Developer. In addition, Exhibit A has been modified to be consistent with Exhibit B. -Software distributed under the License is distributed on an "AS IS" basis, -WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the -specific language governing rights and limitations under the License. The -Original Code is OpenProj. The Original Developer is the Initial Developer and -is Projity, Inc. All portions of the code written by Projity are Copyright (c) +Software distributed under the License is distributed on an "AS IS" basis, +WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the +specific language governing rights and limitations under the License. The +Original Code is OpenProj. The Original Developer is the Initial Developer and +is Projity, Inc. All portions of the code written by Projity are Copyright (c) 2006, 2007. All Rights Reserved. Contributors Projity, Inc. -Alternatively, the contents of this file may be used under the terms of the -Projity End-User License Agreeement (the Projity License), in which case the -provisions of the Projity License are applicable instead of those above. If you -wish to allow use of your version of this file only under the terms of the -Projity License and not to allow others to use your version of this file under -the CPAL, indicate your decision by deleting the provisions above and replace -them with the notice and other provisions required by the Projity License. If -you do not delete the provisions above, a recipient may use your version of this +Alternatively, the contents of this file may be used under the terms of the +Projity End-User License Agreeement (the Projity License), in which case the +provisions of the Projity License are applicable instead of those above. If you +wish to allow use of your version of this file only under the terms of the +Projity License and not to allow others to use your version of this file under +the CPAL, indicate your decision by deleting the provisions above and replace +them with the notice and other provisions required by the Projity License. If +you do not delete the provisions above, a recipient may use your version of this file under either the CPAL or the Projity License. -[NOTE: The text of this license may differ slightly from the text of the notices -in Exhibits A and B of the license at http://www.projity.com/license. You should +[NOTE: The text of this license may differ slightly from the text of the notices +in Exhibits A and B of the license at http://www.projity.com/license. You should use the latest text at http://www.projity.com/license for your modifications. You may not remove this license text from the source files.] -Attribution Information: Attribution Copyright Notice: Copyright � 2006, 2007 -Projity, Inc. Attribution Phrase (not exceeding 10 words): Powered by OpenProj, -an open source solution from Projity. Attribution URL: http://www.projity.com -Graphic Image as provided in the Covered Code as file: openproj_logo.png with +Attribution Information: Attribution Copyright Notice: Copyright � 2006, 2007 +Projity, Inc. Attribution Phrase (not exceeding 10 words): Powered by OpenProj, +an open source solution from Projity. Attribution URL: http://www.projity.com +Graphic Image as provided in the Covered Code as file: openproj_logo.png with alternatives listed on http://www.projity.com/logo -Display of Attribution Information is required in Larger Works which are defined -in the CPAL as a work which combines Covered Code or portions thereof with code -not governed by the terms of the CPAL. However, in addition to the other notice -obligations, all copies of the Covered Code in Executable and Source Code form -distributed must, as a form of attribution of the original author, include on -each user interface screen the "OpenProj" logo visible to all users. The -OpenProj logo should be located horizontally aligned with the menu bar and left -justified on the top left of the screen adjacent to the File menu. The logo -must be at least 100 x 25 pixels. When users click on the "OpenProj" logo it -must direct them back to http://www.projity.com. +Display of Attribution Information is required in Larger Works which are defined +in the CPAL as a work which combines Covered Code or portions thereof with code +not governed by the terms of the CPAL. However, in addition to the other notice +obligations, all copies of the Covered Code in Executable and Source Code form +distributed must, as a form of attribution of the original author, include on +each user interface screen the "OpenProj" logo visible to all users. The +OpenProj logo should be located horizontally aligned with the menu bar and left +justified on the top left of the screen adjacent to the File menu. The logo +must be at least 100 x 25 pixels. When users click on the "OpenProj" logo it +must direct them back to http://www.projity.com. */ package com.projity.session; @@ -71,7 +71,7 @@ if (instance==null) instance=new SessionFactory(); return instance; } - + protected Map<String,Session> sessionImpls=null; protected void initSessions(){ if (sessionImpls==null){ @@ -102,7 +102,7 @@ } } } - } + } protected Session getSession(String name){ initSessions(); Session session=sessionImpls.get(name); @@ -110,11 +110,11 @@ return session; } public Session getSession(boolean local){ - if (Environment.isNoPodServer()) - local = true; + //if (Environment.isNoPodServer()) + // local = true; return local?getSession("local"):getSession("server"); } - + public static Object call(Object object,String method,Class[] argsDesc, Object[] args) throws Exception{ try { //System.out.println("call, "+method+"..."+object.getClass()); @@ -159,11 +159,11 @@ } return null; } - + public void clearSessions() { sessionImpls = null; } - + private final Map credentials=new HashMap(); public void setCredentials(Map credentials){ if (credentials!=null){ @@ -173,7 +173,7 @@ } public String getLogin() { return (String)credentials.get("login"); - + } public String getServerUrl(){ return (String)credentials.get("serverUrl"); @@ -182,7 +182,7 @@ public LocalSession getLocalSession(){ return (LocalSession)getSession("local"); } - + protected JobQueue jobQueue=null; public JobQueue getJobQueue() { return jobQueue; @@ -193,10 +193,10 @@ for (Session session : sessionImpls.values()) session.setJobQueue(jobQueue); } - + public void schedule(Job job){ jobQueue.schedule(job); } - + } |