Reverted changes of revision 547 in order to try another solution for Oryx compatibility

distro/src/setup/files/cfg.cycle/cycle.properties

-activiti.modeler.base.url=http://localhost:8080/activiti-modeler/p/
-cycle.workspace.file.path=eclipse-workspace
+activiti.modeler.base.url=http://localhost:8080/activiti-modeler/
+cycle.workspace.file.path=eclipse-workspace
\ No newline at end of file

modules/activiti-cycle/src/main/java/org/activiti/cycle/impl/connector/signavio/SignavioConnectorConfiguration.java

@@ -36,6 +36,9 @@ public class SignavioConnectorConfiguration extends PasswordEnabledRepositoryCon
    * OSS version (where trying to login leads to an exception)
    */
   private boolean loginRequired = false;
+  //
+
+  public static String SIGNAVIO_BACKEND_URL_SUFFIX = "p/";
 
   public static String REGISTRATION_URL_SUFFIX = "register/";
   public static String LOGIN_URL_SUFFIX = "login/";
@@ -50,8 +53,7 @@ public class SignavioConnectorConfiguration extends PasswordEnabledRepositoryCon
   public static String BPMN_20_IMPORT_SERVLET = "editor/bpmn2_0deserialization";
 
   public SignavioConnectorConfiguration() {
-    // '.../p/' is not standard for all Signavio/Oryx configurations
-    signavioBaseUrl = "http://127.0.0.1:8080/p/";  
+    signavioBaseUrl = "http://127.0.0.1:8080/";
   }
 
   public SignavioConnectorConfiguration(String signavioUrl) {
@@ -83,7 +85,7 @@ public class SignavioConnectorConfiguration extends PasswordEnabledRepositoryCon
   }
 
   public String getSignavioBackendUrl() {
-    return getSignavioUrl();
+    return getSignavioUrl() + SIGNAVIO_BACKEND_URL_SUFFIX;
   }
 
   public String getDirectoryIdFromUrl(String href) {

modules/activiti-cycle/src/test/java/org/activiti/cycle/impl/conf/RepositoryConnectorConfigurationManagerImplTest.java

@@ -38,7 +38,7 @@ public class RepositoryConnectorConfigurationManagerImplTest {
     try {
       ConfigurationContainer enterpriseConfiguration = new ConfigurationContainer("camunda");
       // This one is for all, so don't save a password, the GUI should query it!
-      RepositoryConnectorConfiguration conf1 = new SignavioConnectorConfiguration("Activiti Modeler", "http://localhost:8080/activiti-modeler/p/");
+      RepositoryConnectorConfiguration conf1 = new SignavioConnectorConfiguration("Activiti Modeler", "http://localhost:8080/activiti-modeler/");
       enterpriseConfiguration.addRepositoryConnectorConfiguration(conf1);
 
       ConfigurationContainer userConfiguration = new ConfigurationContainer("bernd");
@@ -117,7 +117,7 @@ public class RepositoryConnectorConfigurationManagerImplTest {
   // // create configurations
   // repoConfManager.persistRepositoryConfiguration(new
   // SignavioConnectorConfiguration("Activiti Modeler",
-  // "http://localhost:8080/activiti-modeler/p/", null,
+  // "http://localhost:8080/activiti-modeler/", null,
   // "christian.lipphardt", "xxx"));
   // repoConfManager.persistRepositoryConfiguration(new
   // FileSystemConnectorConfiguration("Hard Drive", new File("c:")));

modules/activiti-cycle/src/test/java/org/activiti/cycle/impl/connector/demo/DemoConnectorTest.java

@@ -105,7 +105,7 @@ public class DemoConnectorTest {
 
     ConfigurationContainer configuration = new ConfigurationContainer("bernd");
     configuration.addRepositoryConnectorConfiguration(new DemoConnectorConfiguration("demo"));
-    configuration.addRepositoryConnectorConfiguration(new SignavioConnectorConfiguration("signavio", "http://localhost:8080/activiti-modeler/p/"));
+    configuration.addRepositoryConnectorConfiguration(new SignavioConnectorConfiguration("signavio", "http://localhost:8080/activiti-modeler/"));
     configuration.addRepositoryConnectorConfiguration(new FileSystemConnectorConfiguration("files", new File("C:/temp")));
     
     RepositoryConnector conn = new CustomizedViewConfiguration("http://localhost:8080/activiti-cycle/", configuration).createConnector();

modules/activiti-cycle/src/test/java/org/activiti/cycle/impl/connector/signavio/SignavioConnectorTest.java

@@ -80,7 +80,7 @@ public class SignavioConnectorTest {
 	  System.out.println("SourceJSON:\n" + sourceJson);
     
 	  // create signavio conf + connector
-	  SignavioConnectorConfiguration conf = new SignavioConnectorConfiguration("http://localhost:8080/activiti-modeler/p/");
+	  SignavioConnectorConfiguration conf = new SignavioConnectorConfiguration("http://localhost:8080/activiti-modeler/");
     SignavioConnector connector = new SignavioConnector(conf);
 	  
     // test pre-transformation json to bpmn20 xml

modules/activiti-rest/src/main/java/org/activiti/rest/api/cycle/SessionUtil.java

@@ -85,7 +85,7 @@ public class SessionUtil {
   public static ConfigurationContainer createDefaultDemoConfiguration(String currentUserId) {
     ConfigurationContainer configuration = new ConfigurationContainer(currentUserId);
     configuration.addRepositoryConnectorConfiguration(new DemoConnectorConfiguration("demo"));
-    configuration.addRepositoryConnectorConfiguration(new SignavioConnectorConfiguration("signavio", "http://localhost:8080/activiti-modeler/p/"));
+    configuration.addRepositoryConnectorConfiguration(new SignavioConnectorConfiguration("signavio", "http://localhost:8080/activiti-modeler/"));
     configuration.addRepositoryConnectorConfiguration(new FileSystemConnectorConfiguration("files", fsBaseDir));
     return configuration;
   }

userguide/src/en/chapters/ch09-Cycle.xml

@@ -34,7 +34,7 @@
           <org.activiti.cycle.impl.connector.signavio.SignavioConnectorConfiguration>
             <name>Activiti Modeler</name>
             <credentialsSaved>false</credentialsSaved>
-            <signavioBaseUrl>http://localhost:8080/activiti-modeler/p/</signavioBaseUrl>
+            <signavioBaseUrl>http://localhost:8080/activiti-modeler/</signavioBaseUrl>
             <loginRequired>false</loginRequired>
           </org.activiti.cycle.impl.connector.signavio.SignavioConnectorConfiguration>
 
@@ -75,4 +75,4 @@
     <mediaobject><imageobject><imagedata align="center" fileref="images/activiti.cycle.action.forms.png"/></imageobject></mediaobject>
   </section>
   
-</chapter>
+</chapter>
\ No newline at end of file