inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-06-16 17:55:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Moved a bunch of things to more logical locations.

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4497 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park 2006-12-03 15:43:16 +00:00
parent 03a93a3cf7
commit b8595831c8
27 changed files with 56 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
config/alfresco/avm-clt-context.xml
View File

@ -3,7 +3,7 @@
<beans>
<!-- Remote AVM interface -->
<bean id="avmRemote" class="org.alfresco.repo.avm.clt.AVMRemoteImpl">
<bean id="avmRemote" class="org.alfresco.repo.remote.AVMRemoteImpl">
<property name="avmRemoteTransport">
<ref bean="avmRemoteTransport"/>
</property>
@ -14,14 +14,14 @@
<value>rmi://localhost:1313/avm</value>
</property>
<property name="serviceInterface">
<value>org.alfresco.repo.avm.AVMRemoteTransport</value>
<value>org.alfresco.service.cmr.remote.AVMRemoteTransport</value>
</property>
<property name="refreshStubOnConnectFailure">
<value>true</value>
</property>
</bean>
<bean id="avmSyncService" class="org.alfresco.repo.avm.clt.AVMSyncServiceClient">
<bean id="avmSyncService" class="org.alfresco.repo.remote.AVMSyncServiceClient">
<property name="avmSyncServiceTransport">
<ref bean="avmSyncServiceTransport"/>
</property>
@ -32,7 +32,7 @@
<value>rmi://localhost:1313/avmsync</value>
</property>
<property name="serviceInterface">
<value>org.alfresco.service.cmr.avmsync.AVMSyncServiceTransport</value>
<value>org.alfresco.service.cmr.remote.AVMSyncServiceTransport</value>
</property>
<property name="refreshStubOnConnectFailure">
<value>true</value>

4
config/alfresco/avm-services-context.xml
View File

@ -209,7 +209,7 @@
<ref bean="avmRemoteTransport"/>
</property>
<property name="serviceInterface">
<value>org.alfresco.repo.avm.AVMRemoteTransport</value>
<value>org.alfresco.service.cmr.remote.AVMRemoteTransport</value>
</property>
<property name="serviceName">
<value>avm</value>
@ -233,7 +233,7 @@
<ref bean="avmSyncServiceTransport"/>
</property>
<property name="serviceInterface">
<value>org.alfresco.service.cmr.avmsync.AVMSyncServiceTransport</value>
<value>org.alfresco.service.cmr.remote.AVMSyncServiceTransport</value>
</property>
<property name="serviceName">
<value>avmsync</value>

8
config/alfresco/remote-avm-test-context.xml
View File

@ -17,7 +17,7 @@
</bean>
<!-- Remote interface for AVM. -->
<bean id="avmRemote" class="org.alfresco.repo.avm.clt.AVMRemoteImpl">
<bean id="avmRemote" class="org.alfresco.repo.remote.AVMRemoteImpl">
<property name="avmRemoteTransport">
<ref bean="avmRemoteTransport"/>
</property>
@ -29,14 +29,14 @@
<value>rmi://localhost:1313/avm</value>
</property>
<property name="serviceInterface">
<value>org.alfresco.repo.avm.AVMRemoteTransport</value>
<value>org.alfresco.service.cmr.remote.AVMRemoteTransport</value>
</property>
<property name="refreshStubOnConnectFailure">
<value>true</value>
</property>
</bean>
<bean id="avmSyncService" class="org.alfresco.repo.avm.clt.AVMSyncServiceClient">
<bean id="avmSyncService" class="org.alfresco.repo.remote.AVMSyncServiceClient">
<property name="avmSyncServiceTransport">
<ref bean="avmSyncServiceTransport"/>
</property>
@ -47,7 +47,7 @@
<value>rmi://localhost:1313/avmsync</value>
</property>
<property name="serviceInterface">
<value>org.alfresco.service.cmr.avmsync.AVMSyncServiceTransport</value>
<value>org.alfresco.service.cmr.remote.AVMSyncServiceTransport</value>
</property>
<property name="refreshStubOnConnectFailure">
<value>true</value>

1
source/java/org/alfresco/repo/avm/AVMRemoteLocal.java
View File

@ -16,6 +16,7 @@ import org.alfresco.service.cmr.avm.AVMService;
import org.alfresco.service.cmr.avm.AVMStoreDescriptor;
import org.alfresco.service.cmr.avm.LayeringDescriptor;
import org.alfresco.service.cmr.avm.VersionDescriptor;
import org.alfresco.service.cmr.remote.AVMRemote;
import org.alfresco.service.namespace.QName;
/**

1
source/java/org/alfresco/repo/avm/AVMRemoteTransportService.java
View File

@ -20,6 +20,7 @@ import org.alfresco.service.cmr.avm.AVMService;
import org.alfresco.service.cmr.avm.AVMStoreDescriptor;
import org.alfresco.service.cmr.avm.LayeringDescriptor;
import org.alfresco.service.cmr.avm.VersionDescriptor;
import org.alfresco.service.cmr.remote.AVMRemoteTransport;
import org.alfresco.service.cmr.security.AuthenticationService;
import org.alfresco.service.namespace.QName;
import org.alfresco.util.GUID;

2
source/java/org/alfresco/repo/avm/AVMSyncServiceTransportImpl.java
View File

@ -7,7 +7,7 @@ import java.util.List;
import org.alfresco.service.cmr.avmsync.AVMDifference;
import org.alfresco.service.cmr.avmsync.AVMSyncService;
import org.alfresco.service.cmr.avmsync.AVMSyncServiceTransport;
import org.alfresco.service.cmr.remote.AVMSyncServiceTransport;
import org.alfresco.service.cmr.security.AuthenticationService;
/**

3
source/java/org/alfresco/repo/avm/AVMTestRemote.java
View File

@ -21,10 +21,11 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.util.List;
import org.alfresco.repo.avm.clt.ClientTicketHolder;
import org.alfresco.repo.remote.ClientTicketHolder;
import org.alfresco.service.cmr.avm.AVMStoreDescriptor;
import org.alfresco.service.cmr.avmsync.AVMDifference;
import org.alfresco.service.cmr.avmsync.AVMSyncService;
import org.alfresco.service.cmr.remote.AVMRemote;
import org.alfresco.service.cmr.security.AuthenticationService;
import org.springframework.context.support.FileSystemXmlApplicationContext;

2
source/java/org/alfresco/repo/avm/FileNameValidator.java
View File

@ -28,7 +28,7 @@ public class FileNameValidator
/**
* The bad file name pattern.
*/
private static String fgBadPattern = ".*[\"\\*\\\\><\\?/:\\|\\xA3\\xAC%&\\+;]+.*";
private static String fgBadPattern = ".*[\"\\*\\\\><\\?/:\\|\\xA3\\xAC%&;]+.*";
/**
* The compiled regex.

4
source/java/org/alfresco/repo/avm/clt/AVMCopyIn.java → source/java/org/alfresco/repo/clt/AVMCopyIn.java
View File

@ -1,7 +1,7 @@
/**
*
*/
package org.alfresco.repo.avm.clt;
package org.alfresco.repo.clt;
import java.io.File;
import java.io.FileInputStream;
@ -17,7 +17,7 @@ import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
* Like cp from a local filesystem to AVM.
* @author britt
*/
public class AVMCopyIn extends AVMCltBase
public class AVMCopyIn extends CltBase
{
private static Object [] flagDefs = { "-r", 0, "-v", 0 };

4
source/java/org/alfresco/repo/avm/clt/AVMCopyOut.java → source/java/org/alfresco/repo/clt/AVMCopyOut.java
View File

@ -1,7 +1,7 @@
/**
*
*/
package org.alfresco.repo.avm.clt;
package org.alfresco.repo.clt;
import java.io.File;
import java.io.FileOutputStream;
@ -18,7 +18,7 @@ import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
* to a local filesystem.
* @author britt
*/
public class AVMCopyOut extends AVMCltBase
public class AVMCopyOut extends CltBase
{
private static Object [] flagDefs = { "-r", 0, "-v", 0 };

4
source/java/org/alfresco/repo/avm/clt/AVMLs.java → source/java/org/alfresco/repo/clt/AVMLs.java
View File

@ -1,7 +1,7 @@
/**
*
*/
package org.alfresco.repo.avm.clt;
package org.alfresco.repo.clt;
import java.util.List;
import java.util.Map;
@ -12,7 +12,7 @@ import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
* Get a listing of a node.
* @author britt
*/
public class AVMLs extends AVMCltBase
public class AVMLs extends CltBase
{
private static Object [] flagDefs = { "-R", 0 };

4
source/java/org/alfresco/repo/avm/clt/AVMLsStores.java → source/java/org/alfresco/repo/clt/AVMLsStores.java
View File

@ -1,7 +1,7 @@
/**
*
*/
package org.alfresco.repo.avm.clt;
package org.alfresco.repo.clt;
import java.util.List;
import java.util.Map;
@ -12,7 +12,7 @@ import org.alfresco.service.cmr.avm.AVMStoreDescriptor;
* List all avm stores in the repository.
* @author britt
*/
public class AVMLsStores extends AVMCltBase
public class AVMLsStores extends CltBase
{
private static Object[] flagDefs = { };

4
source/java/org/alfresco/repo/avm/clt/AVMLsVersions.java → source/java/org/alfresco/repo/clt/AVMLsVersions.java
View File

@ -1,7 +1,7 @@
/**
*
*/
package org.alfresco.repo.avm.clt;
package org.alfresco.repo.clt;
import java.util.List;
import java.util.Map;
@ -12,7 +12,7 @@ import org.alfresco.service.cmr.avm.VersionDescriptor;
* List all versions of a given store.
* @author britt
*/
public class AVMLsVersions extends AVMCltBase
public class AVMLsVersions extends CltBase
{
private static Object [] flagDefs = { };

4
source/java/org/alfresco/repo/avm/clt/AVMMkDir.java → source/java/org/alfresco/repo/clt/AVMMkDir.java
View File

@ -1,7 +1,7 @@
/**
*
*/
package org.alfresco.repo.avm.clt;
package org.alfresco.repo.clt;
import java.util.List;
import java.util.Map;
@ -12,7 +12,7 @@ import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
* Make a directory.
* @author britt
*/
public class AVMMkDir extends AVMCltBase
public class AVMMkDir extends CltBase
{
private static Object [] flagDefs = { "-p", 0 };

4
source/java/org/alfresco/repo/avm/clt/AVMMkLayeredDir.java → source/java/org/alfresco/repo/clt/AVMMkLayeredDir.java
View File

@ -1,7 +1,7 @@
/**
*
*/
package org.alfresco.repo.avm.clt;
package org.alfresco.repo.clt;
import java.util.List;
import java.util.Map;
@ -10,7 +10,7 @@ import java.util.Map;
* @author britt
*
*/
public class AVMMkLayeredDir extends AVMCltBase
public class AVMMkLayeredDir extends CltBase
{
private static Object [] flagDefs = { };

4
source/java/org/alfresco/repo/avm/clt/AVMMkStore.java → source/java/org/alfresco/repo/clt/AVMMkStore.java
View File

@ -1,7 +1,7 @@
/**
*
*/
package org.alfresco.repo.avm.clt;
package org.alfresco.repo.clt;
import java.util.List;
import java.util.Map;
@ -10,7 +10,7 @@ import java.util.Map;
* Create an AVM store.
* @author britt
*/
public class AVMMkStore extends AVMCltBase
public class AVMMkStore extends CltBase
{
private static Object [] flagDefs = { };

4
source/java/org/alfresco/repo/avm/clt/AVMRm.java → source/java/org/alfresco/repo/clt/AVMRm.java
View File

@ -1,7 +1,7 @@
/**
*
*/
package org.alfresco.repo.avm.clt;
package org.alfresco.repo.clt;
import java.util.List;
import java.util.Map;
@ -10,7 +10,7 @@ import java.util.Map;
* Remove an AVM Node.
* @author britt
*/
public class AVMRm extends AVMCltBase
public class AVMRm extends CltBase
{
private static Object [] flagDefs = { };

4
source/java/org/alfresco/repo/avm/clt/AVMSnapshot.java → source/java/org/alfresco/repo/clt/AVMSnapshot.java
View File

@ -1,7 +1,7 @@
/**
*
*/
package org.alfresco.repo.avm.clt;
package org.alfresco.repo.clt;
import java.util.List;
import java.util.Map;
@ -10,7 +10,7 @@ import java.util.Map;
* Snapshot a store.
* @author britt
*/
public class AVMSnapshot extends AVMCltBase
public class AVMSnapshot extends CltBase
{
private static Object [] flagDefs = { };

9
source/java/org/alfresco/repo/avm/clt/AVMCltBase.java → source/java/org/alfresco/repo/clt/CltBase.java
View File

@ -1,7 +1,7 @@
/**
*
*/
package org.alfresco.repo.avm.clt;
package org.alfresco.repo.clt;
import java.io.IOException;
import java.io.InputStream;
@ -11,8 +11,9 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.alfresco.repo.avm.AVMRemote;
import org.alfresco.repo.remote.ClientTicketHolder;
import org.alfresco.service.cmr.avmsync.AVMSyncService;
import org.alfresco.service.cmr.remote.AVMRemote;
import org.alfresco.service.cmr.security.AuthenticationService;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@ -21,7 +22,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
* This is the base class for AVM clts.
* @author britt
*/
public abstract class AVMCltBase
public abstract class CltBase
{
/**
* The instance of the remote interface.
@ -49,7 +50,7 @@ public abstract class AVMCltBase
* services.
* @param args The program arguments.
*/
protected AVMCltBase()
protected CltBase()
{
fContext = new ClassPathXmlApplicationContext("alfresco/avm-clt-context.xml");
fAVMRemote = (AVMRemote)fContext.getBean("avmRemote");

8
source/java/org/alfresco/repo/avm/clt/AVMRemoteImpl.java → source/java/org/alfresco/repo/remote/AVMRemoteImpl.java
View File

@ -1,7 +1,7 @@
/**
*
*/
package org.alfresco.repo.avm.clt;
package org.alfresco.repo.remote;
import java.io.InputStream;
import java.io.OutputStream;
@ -10,15 +10,13 @@ import java.util.List;
import java.util.Map;
import java.util.SortedMap;
import org.alfresco.repo.avm.AVMRemote;
import org.alfresco.repo.avm.AVMRemoteInputStream;
import org.alfresco.repo.avm.AVMRemoteOutputStream;
import org.alfresco.repo.avm.AVMRemoteTransport;
import org.alfresco.repo.domain.PropertyValue;
import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
import org.alfresco.service.cmr.avm.AVMStoreDescriptor;
import org.alfresco.service.cmr.avm.LayeringDescriptor;
import org.alfresco.service.cmr.avm.VersionDescriptor;
import org.alfresco.service.cmr.remote.AVMRemote;
import org.alfresco.service.cmr.remote.AVMRemoteTransport;
import org.alfresco.service.namespace.QName;
/**

4
source/java/org/alfresco/repo/avm/AVMRemoteInputStream.java → source/java/org/alfresco/repo/remote/AVMRemoteInputStream.java
View File

@ -15,12 +15,12 @@
* License.
*/
package org.alfresco.repo.avm;
package org.alfresco.repo.remote;
import java.io.IOException;
import java.io.InputStream;
import org.alfresco.repo.avm.clt.ClientTicketHolder;
import org.alfresco.service.cmr.remote.AVMRemoteTransport;
/**
* Wrapper around AVMRemote stream reading.

4
source/java/org/alfresco/repo/avm/AVMRemoteOutputStream.java → source/java/org/alfresco/repo/remote/AVMRemoteOutputStream.java
View File

@ -14,12 +14,12 @@
* language governing permissions and limitations under the
* License.
*/
package org.alfresco.repo.avm;
package org.alfresco.repo.remote;
import java.io.IOException;
import java.io.OutputStream;
import org.alfresco.repo.avm.clt.ClientTicketHolder;
import org.alfresco.service.cmr.remote.AVMRemoteTransport;
public class AVMRemoteOutputStream extends OutputStream
{

4
source/java/org/alfresco/repo/avm/clt/AVMSyncServiceClient.java → source/java/org/alfresco/repo/remote/AVMSyncServiceClient.java
View File

@ -1,13 +1,13 @@
/**
*
*/
package org.alfresco.repo.avm.clt;
package org.alfresco.repo.remote;
import java.util.List;
import org.alfresco.service.cmr.avmsync.AVMDifference;
import org.alfresco.service.cmr.avmsync.AVMSyncService;
import org.alfresco.service.cmr.avmsync.AVMSyncServiceTransport;
import org.alfresco.service.cmr.remote.AVMSyncServiceTransport;
/**
* Client side wrapper around the RMI based AVMSyncServiceTransport.

2
source/java/org/alfresco/repo/avm/clt/ClientTicketHolder.java → source/java/org/alfresco/repo/remote/ClientTicketHolder.java
View File

@ -1,7 +1,7 @@
/**
*
*/
package org.alfresco.repo.avm.clt;
package org.alfresco.repo.remote;
/**
* Remote client utility to hold an authentication ticket.

2
source/java/org/alfresco/repo/avm/AVMRemote.java → source/java/org/alfresco/service/cmr/remote/AVMRemote.java
View File

@ -15,7 +15,7 @@
* License.
*/
package org.alfresco.repo.avm;
package org.alfresco.service.cmr.remote;
import java.io.InputStream;
import java.io.OutputStream;

2
source/java/org/alfresco/repo/avm/AVMRemoteTransport.java → source/java/org/alfresco/service/cmr/remote/AVMRemoteTransport.java
View File

@ -1,7 +1,7 @@
/**
*
*/
package org.alfresco.repo.avm;
package org.alfresco.service.cmr.remote;
import java.util.Date;
import java.util.List;

4
source/java/org/alfresco/service/cmr/avmsync/AVMSyncServiceTransport.java → source/java/org/alfresco/service/cmr/remote/AVMSyncServiceTransport.java
View File

@ -1,10 +1,12 @@
/**
*
*/
package org.alfresco.service.cmr.avmsync;
package org.alfresco.service.cmr.remote;
import java.util.List;
import org.alfresco.service.cmr.avmsync.AVMDifference;
/**
* A wrapper around AVMSyncService for remote access.
* @author britt