Code refactoring.

Author: dudaerich

README.md

@@ -6,7 +6,7 @@ Example program for WS-Transfer SOAP extension implemented in the Apache CXF pro
 Scenario
 --------
 
-There are two separate servers. The first server called *ResourceFactoryServer* provides two services - *ResourceFactory* and *Resource*. The second server called *ResourceServer* contains one service *Resource*. Client program has reference only to the *ResourceFactory*. When the client sends request to create resource, the *ResourceFactory* makes decision where the resource will be stored. It can be stored locally in the first server or remotely in the second server. After creating the resource a reference parameters are returned. By this way the client can later *get*, *put* or *delete* the created resource.
+There are two separate servers. The first server called *Student* provides two services - *ResourceFactory* and *Resource*. The second server called *Teacher* contains one service *Resource*. Client program has reference only to the first server on *ResourceFactory* endpoint. When the client sends request to create resource, the *ResourceFactory* makes decision where the resource will be stored. It can be stored locally in the first server or remotely in the second server. After creating the resource a reference parameters are returned. By this way the client can later *get*, *put* or *delete* the created resource.
 
 The *ResourceFactory* supports two types of XML representations - student and teacher. If other type of XML representation is requested to create, the InvalidRepresentation fault is thrown. All elements in representations are optional. If they are not defined so the "Unspecified" value is set. The *ResourceFactory* generates an *UID* (University Identifier) for each accepted XML representation. The *UID* can't be modified by *put* request. If the method tries to change the *UID* the *PutDenied* fault is thrown.
 
@@ -22,11 +22,11 @@ mvn exec:java -pl client
 ```
 
 ```
-mvn exec:java -pl resourcefactory
+mvn exec:java -pl studentserver
 ```
 
 ```
-mvn exec:java -pl resource
+mvn exec:java -pl teacherserver
 ```
 
 Usage

pom.xml

@@ -16,8 +16,8 @@
 
   <modules>
       <module>client</module>
-      <module>resourcefactory</module>
-      <module>resource</module>
+      <module>studentserver</module>
+      <module>teacherserver</module>
   </modules>
 
 </project>

resourcefactory/pom.xml studentserver/pom.xml

@@ -34,7 +34,7 @@
           </execution>
         </executions>
         <configuration>
-          <mainClass>org.apache.cxf.example.wstransferexample.server.resourcefactory.ResourceFactoryServer</mainClass>
+          <mainClass>org.apache.cxf.example.wstransferexample.server.resourcefactory.Server</mainClass>
         </configuration>
       </plugin>
       <plugin>
@@ -50,7 +50,7 @@
                 <configuration>
                     <transformers>
                         <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                            <mainClass>org.apache.cxf.example.wstransferexample.server.resourcefactory.ResourceFactoryServer</mainClass>
+                            <mainClass>org.apache.cxf.example.wstransferexample.server.resourcefactory.Server</mainClass>
                         </transformer>
                         <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
                             <resource>META-INF/cxf/bus-extensions.txt</resource>

resourcefactory/resourcefactory.jar studentserver/resourcefactory.jar

@@ -23,14 +23,13 @@
 import org.apache.cxf.ws.transfer.resourcefactory.ResourceFactory;
 import org.apache.cxf.ws.transfer.resourcefactory.ResourceFactoryImpl;
 import org.apache.cxf.ws.transfer.validationtransformation.XSDResourceTypeIdentifier;
-import org.apache.cxf.ws.transfer.validationtransformation.XSDResourceValidator;
 import org.apache.cxf.ws.transfer.validationtransformation.XSLTResourceTransformer;
 
 /**
- * ResourceFactoryServer main class.
+ * Server main class.
  * @author Erich Duda
  */
-public class ResourceFactoryServer {
+public class Server {
 
     public static void main(String[] args) {
         Options options = new Options();
@@ -64,9 +63,9 @@ private static void createResource(ResourceManager resourceManager) {
         resourceLocal.setManager(resourceManager);
         resourceLocal.getResourceTypeIdentifiers().add(
                 new XSDResourceTypeIdentifier(
-                        new StreamSource(ResourceFactoryServer.class.getResourceAsStream("/xml/schema/studentPut.xsd")),
+                        new StreamSource(Server.class.getResourceAsStream("/xml/schema/studentPut.xsd")),
                         new XSLTResourceTransformer(
-                                new StreamSource(ResourceFactoryServer.class.getResourceAsStream("/xml/xslt/studentPut.xsl")),
+                                new StreamSource(Server.class.getResourceAsStream("/xml/xslt/studentPut.xsl")),
                                 new StudentPutResourceValidator())));
         JaxWsServerFactoryBean factory = new JaxWsServerFactoryBean();
         factory.setServiceClass(Resource.class);
@@ -91,15 +90,15 @@ private static void createResourceFactory(ResourceManager resourceManager) {
                         Config.getInstance().getResourceTeachersUrl()));
         resourceFactory.getResourceTypeIdentifiers().add(
                 new XSDResourceTypeIdentifier(
-                        new StreamSource(ResourceFactoryServer.class.getResourceAsStream("/xml/schema/studentCreate.xsd")),
+                        new StreamSource(Server.class.getResourceAsStream("/xml/schema/studentCreate.xsd")),
                         new XSLTResourceTransformer(
-                                new StreamSource(ResourceFactoryServer.class.getResourceAsStream("/xml/xslt/studentCreate.xsl")))));
+                                new StreamSource(Server.class.getResourceAsStream("/xml/xslt/studentCreate.xsl")))));
         resourceFactory.getResourceTypeIdentifiers().add(
                 new XSDResourceTypeIdentifier(
-                        new StreamSource(ResourceFactoryServer.class.getResourceAsStream("/xml/schema/teacherCreateBasic.xsd")),
+                        new StreamSource(Server.class.getResourceAsStream("/xml/schema/teacherCreateBasic.xsd")),
                         new XSLTResourceTransformer(
                                 new StreamSource(
-                                        ResourceFactoryServer.class.getResourceAsStream("/xml/xslt/teacherCreateBasic.xsl")))));
+                                        Server.class.getResourceAsStream("/xml/xslt/teacherCreateBasic.xsl")))));
         JaxWsServerFactoryBean factory = new JaxWsServerFactoryBean();
         factory.setServiceClass(ResourceFactory.class);
         factory.setServiceBean(resourceFactory);

resourcefactory/src/main/java/org/apache/cxf/example/wstransferexample/server/resourcefactory/Config.java studentserver/src/main/java/org/apache/cxf/example/wstransferexample/server/resourcefactory/Config.java

@@ -34,7 +34,7 @@
           </execution>
         </executions>
         <configuration>
-          <mainClass>org.apache.cxf.example.wstransfexample.server.resource.ResourceServer</mainClass>
+          <mainClass>org.apache.cxf.example.wstransfexample.server.resource.Server</mainClass>
         </configuration>
       </plugin>
       <plugin>
@@ -50,7 +50,7 @@
                 <configuration>
                     <transformers>
                         <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                            <mainClass>org.apache.cxf.example.wstransfexample.server.resource.ResourceServer</mainClass>
+                            <mainClass>org.apache.cxf.example.wstransfexample.server.resource.Server</mainClass>
                         </transformer>
                         <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
                             <resource>META-INF/cxf/bus-extensions.txt</resource>

resourcefactory/src/main/java/org/apache/cxf/example/wstransferexample/server/resourcefactory/MyResourceResolver.java studentserver/src/main/java/org/apache/cxf/example/wstransferexample/server/resourcefactory/MyResourceResolver.java

@@ -23,14 +23,13 @@
 import org.apache.cxf.ws.transfer.resourcefactory.ResourceFactory;
 import org.apache.cxf.ws.transfer.shared.TransferConstants;
 import org.apache.cxf.ws.transfer.validationtransformation.XSDResourceTypeIdentifier;
-import org.apache.cxf.ws.transfer.validationtransformation.XSDResourceValidator;
 import org.apache.cxf.ws.transfer.validationtransformation.XSLTResourceTransformer;
 
 /**
  *
  * @author erich
  */
-public class ResourceServer {
+public class Server {
 
     public static void main(String[] args) {
         Options options = new Options();
@@ -54,9 +53,9 @@ public static void main(String[] args) {
         ResourceRemote resourceRemote = new ResourceRemote();
         resourceRemote.setManager(resourceManager);
         resourceRemote.getResourceTypeIdentifiers().add(new XSDResourceTypeIdentifier(
-                new StreamSource(ResourceServer.class.getResourceAsStream("/xml/schema/teacher.xsd")),
+                new StreamSource(Server.class.getResourceAsStream("/xml/schema/teacher.xsd")),
                 new XSLTResourceTransformer(
-                        new StreamSource(ResourceServer.class.getResourceAsStream("/xml/xslt/teacherDefaultValues.xsl")),
+                        new StreamSource(Server.class.getResourceAsStream("/xml/xslt/teacherDefaultValues.xsl")),
                         new TeacherResourceValidator())));
 
         createResourceFactoryEndpoint(resourceRemote);