ACT-1113: removed cycle from distro/test.install and removed ProcessEngineConfiguration properties

distro/src/setup/build.properties

@@ -13,8 +13,5 @@ tomcat.version=6.0.32
 # downloaded there.
 downloads.dir=../../downloads
 
-# Remove this property or set it to disabled if you're not using Activiti Cycle
-feature.cycle=enabled
-
 # Remove this property or set it to disabled if you're not using Activiti Modeler
 feature.modeler=enabled
\ No newline at end of file

distro/src/setup/build.xml

@@ -12,7 +12,6 @@
   <property name="activiti.version" value="5.9-SNAPSHOT" />   
   <property name="tomcat.url" value="http://activiti.org/downloads/" />
   
-  <property name="cycle.workspace" location="${activiti.home}/workspace/activiti-cycle-examples"/>
   <property name="activiti.modeler.base.url" value="http://localhost:8080/activiti-modeler/" />
 
   <!-- ### OS PROPERTIES #################################################################### -->
@@ -28,11 +27,7 @@
   </condition>
 	
 	<!-- ### DEMO SETUP OPTIONAL FEATURES #################################################################### -->	
-  
-  <condition property="cycle.is.enabled">
-    <equals arg1="${feature.cycle}" arg2="enabled" />
-  </condition>
-  
+   
   <condition property="modeler.is.enabled">
     <equals arg1="${feature.modeler}" arg2="enabled" />
   </condition>
@@ -161,11 +156,6 @@
     <mkdir dir="build/demo" />
     <copy file="files/demo/${db}.data.sql" todir="build/demo" />
     
-    <!-- replace some properties currently needed/used for cycle config -->
-    <replace file="build/demo/${db}.data.sql">
-      <replacefilter token="@activiti.modeler.base.url@" value="${activiti.modeler.base.url}" />
-      <replacefilter token="@cycle.base.file.path@" value="${cycle.workspace}" />
-    </replace>
     <sql driver="${jdbc.driver}" 
          password="${jdbc.password}" 
          url="${jdbc.url}" 

distro/src/setup/files/cfg.activiti/standalone/activiti.cfg.xml

@@ -15,8 +15,6 @@
     
     <property name="jobExecutorActivate" value="true" />
 
-    <property name="dbCycleUsed" value="true" />
-    
   </bean>
 
 </beans>

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

-activiti.modeler.base.url=http://localhost:8080/activiti-modeler/
-database=@db@
-jdbc.driver=@jdbc.driver@
-jdbc.url=@jdbc.url@
-jdbc.username=@jdbc.username@
-jdbc.password=@jdbc.password@

distro/src/setup/files/demo/h2.data.sql

@@ -26,89 +26,4 @@ insert into ACT_ID_MEMBERSHIP values ('gonzo', 'sales');
 
 update ACT_GE_PROPERTY
 set VALUE_ = '10'
-where NAME_ = 'next.dbid';
-
-insert into ACT_CY_CONN_CONFIG values ('1', 
-				'org.activiti.cycle.impl.connector.fs.FileSystemConnector',
-				'Eclipse Workspace (File System)',
-				'Workspace',
-				'kermit', '',
-				'<map><entry><string>basePath</string><string>@cycle.base.file.path@</string></entry></map>');
-insert into ACT_CY_CONN_CONFIG values ('2', 
-				'org.activiti.cycle.impl.connector.signavio.SignavioConnector',
-				'Activiti Modeler',
-				'Activiti',
-				'kermit', '',
-				'<map>
-					<entry><string>signavioBaseUrl</string><string>@activiti.modeler.base.url@</string></entry>
-					<entry><string>loginRequired</string><boolean>false</boolean></entry>
-				</map>');
-
-insert into ACT_CY_CONN_CONFIG values ('3', 
-				'org.activiti.cycle.impl.connector.fs.FileSystemConnector',
-				'Eclipse Workspace (File System)',
-				'Workspace',
-				'fozzie', '',
-				'<map><entry><string>basePath</string><string>@cycle.base.file.path@</string></entry></map>');
-insert into ACT_CY_CONN_CONFIG values ('4', 
-				'org.activiti.cycle.impl.connector.signavio.SignavioConnector',
-				'Activiti Modeler',
-				'Activiti',
-				'fozzie', '',
-				'<map>
-					<entry><string>signavioBaseUrl</string><string>@activiti.modeler.base.url@</string></entry>
-					<entry><string>loginRequired</string><boolean>false</boolean></entry>
-				</map>');
-
-insert into ACT_CY_CONN_CONFIG values ('5', 
-				'org.activiti.cycle.impl.connector.fs.FileSystemConnector',
-				'Eclipse Workspace (File System)',
-				'Workspace',
-				'gonzo', '',
-				'<map><entry><string>basePath</string><string>@cycle.base.file.path@</string></entry></map>');
-insert into ACT_CY_CONN_CONFIG values ('6', 
-				'org.activiti.cycle.impl.connector.signavio.SignavioConnector',
-				'Activiti Modeler',
-				'Activiti',
-				'gonzo', '',
-				'<map>
-					<entry><string>signavioBaseUrl</string><string>@activiti.modeler.base.url@</string></entry>
-					<entry><string>loginRequired</string><boolean>false</boolean></entry>
-				</map>');				
-
-		
-insert  into  ACT_CY_CONFIG values ('1', 
-									'processSolutionTemplates', 
-									'default',
-									'<processSolutionTemplate> 
-										<vFolder type="Management" name="Management" connectorId="Workspace" referencedNodeId="/" /> 
-										<vFolder type="Processes" name="Processes" connectorId="Activiti" referencedNodeId="/root-directory" /> 
-										<vFolder type="Requirements" name="Requirements" connectorId="Workspace" referencedNodeId="/" /> 
-										<vFolder type="Implementation" name="Implementation" connectorId="Workspace" referencedNodeId="/" /> 
-									</processSolutionTemplate>');	
-
-insert 	into ACT_CY_PROCESS_SOLUTION values ('ps1',
-											 'Easy Bugfiling Process',
-											 'IN_SPECIFICATION');
-											 
-insert into ACT_CY_V_FOLDER values('ps1Management',
-								   'Management',
-								   'Workspace',
-								   '/EasyBugFilingProcess/Management',
-								   'ps1',
-								   'Management');
-insert into ACT_CY_V_FOLDER values('ps1Requirements',
-								   'Requirements',
-								   'Workspace',
-								   '/EasyBugFilingProcess/Requirements',
-								   'ps1',
-								   'Requirements');
-insert into ACT_CY_V_FOLDER values('ps1Implementation',
-								   'Implementation',
-								   'Workspace',
-								   '/EasyBugFilingProcess/Implementation',
-								   'ps1',
-								   'Implementation');
-
-											 
-											 
\ No newline at end of file
+where NAME_ = 'next.dbid';
\ No newline at end of file

modules/activiti-engine/src/main/java/org/activiti/engine/impl/cfg/ProcessEngineConfigurationImpl.java

@@ -266,7 +266,6 @@ public abstract class ProcessEngineConfigurationImpl extends ProcessEngineConfig
 
   protected boolean isDbIdentityUsed = true;
   protected boolean isDbHistoryUsed = true;
-  protected boolean isDbCycleUsed = false;
   
   protected DelegateInterceptor delegateInterceptor;
 
@@ -559,7 +558,6 @@ public abstract class ProcessEngineConfigurationImpl extends ProcessEngineConfig
       dbSqlSessionFactory.setSqlSessionFactory(sqlSessionFactory);
       dbSqlSessionFactory.setDbIdentityUsed(isDbIdentityUsed);
       dbSqlSessionFactory.setDbHistoryUsed(isDbHistoryUsed);
-      dbSqlSessionFactory.setDbCycleUsed(isDbCycleUsed);
       addSessionFactory(dbSqlSessionFactory);
       
       addSessionFactory(new GenericManagerFactory(AttachmentManager.class));
@@ -1506,27 +1504,14 @@ public abstract class ProcessEngineConfigurationImpl extends ProcessEngineConfig
   public boolean isDbHistoryUsed() {
     return isDbHistoryUsed;
   }
-
   
   public void setDbHistoryUsed(boolean isDbHistoryUsed) {
     this.isDbHistoryUsed = isDbHistoryUsed;
   }
-
-  
-  public boolean isDbCycleUsed() {
-    return isDbCycleUsed;
-  }
-
-  
-  public void setDbCycleUsed(boolean isDbCycleUsed) {
-    this.isDbCycleUsed = isDbCycleUsed;
-  }
-
   
   public List<ResolverFactory> getResolverFactories() {
     return resolverFactories;
   }
-
   
   public void setResolverFactories(List<ResolverFactory> resolverFactories) {
     this.resolverFactories = resolverFactories;

modules/activiti-engine/src/main/java/org/activiti/engine/impl/db/DbSqlSession.java

@@ -502,9 +502,6 @@ public class DbSqlSession implements Session {
       if (dbSqlSessionFactory.isDbIdentityUsed() && !isIdentityTablePresent()) {
         errorMessage = addMissingComponent(errorMessage, "identity");
       }
-      if (dbSqlSessionFactory.isDbCycleUsed() && !isCycleTablePresent()) {
-        errorMessage = addMissingComponent(errorMessage, "cycle");
-      }
       
       Integer configuredHistoryLevel = Context.getProcessEngineConfiguration().getHistoryLevel();
       PropertyEntity historyLevelProperty = selectById(PropertyEntity.class, "historyLevel");
@@ -580,13 +577,6 @@ public class DbSqlSession implements Session {
     if (processEngineConfiguration.isDbIdentityUsed()) {
       dbSchemaCreateIdentity();
     }
-    if (processEngineConfiguration.isDbCycleUsed()) {
-      dbSchemaCreateCycle();
-    }
-  }
-
-  protected void dbSchemaCreateCycle() {
-    executeMandatorySchemaResource("create", "cycle");
   }
 
   protected void dbSchemaCreateIdentity() {
@@ -613,9 +603,6 @@ public class DbSqlSession implements Session {
     if (dbSqlSessionFactory.isDbIdentityUsed()) {
       executeMandatorySchemaResource("drop", "identity");
     }
-    if (dbSqlSessionFactory.isDbCycleUsed()) {
-      executeMandatorySchemaResource("drop", "cycle");
-    }
   }
 
   public void dbSchemaPrune() {
@@ -625,9 +612,6 @@ public class DbSqlSession implements Session {
     if (isIdentityTablePresent() && dbSqlSessionFactory.isDbIdentityUsed()) {
       executeMandatorySchemaResource("drop", "identity");
     }
-    if (isCycleTablePresent() && dbSqlSessionFactory.isDbCycleUsed()) {
-      executeMandatorySchemaResource("drop", "cycle");
-    }
   }
 
   public void executeMandatorySchemaResource(String operation, String component) {
@@ -685,13 +669,6 @@ public class DbSqlSession implements Session {
       dbSchemaCreateIdentity();
     }
     
-    if (isCycleTablePresent()) {
-      if (isUpgradeNeeded) {
-        dbSchemaUpgrade("cycle", dbVersion);
-      }
-    } else if (dbSqlSessionFactory.isDbCycleUsed()) {
-      dbSchemaCreateCycle();
-    }
     return feedback;
   }
 
@@ -704,9 +681,6 @@ public class DbSqlSession implements Session {
   public boolean isIdentityTablePresent(){
     return isTablePresent("ACT_ID_USER");
   }
-  public boolean isCycleTablePresent(){
-    return isTablePresent("ACT_CY_CONFIG");
-  }
 
   public boolean isTablePresent(String tableName) {
     Connection connection = null;

modules/activiti-engine/src/main/java/org/activiti/engine/impl/db/DbSqlSessionFactory.java

@@ -71,7 +71,6 @@ public class DbSqlSessionFactory implements SessionFactory {
   protected Map<Class<?>,String>  selectStatements = Collections.synchronizedMap(new HashMap<Class<?>, String>());
   protected boolean isDbIdentityUsed = true;
   protected boolean isDbHistoryUsed = true;
-  protected boolean isDbCycleUsed = true;
 
   public Class< ? > getSessionType() {
     return DbSqlSession.class;
@@ -228,13 +227,4 @@ public class DbSqlSessionFactory implements SessionFactory {
     this.isDbHistoryUsed = isDbHistoryUsed;
   }
 
-  
-  public boolean isDbCycleUsed() {
-    return isDbCycleUsed;
-  }
-
-  
-  public void setDbCycleUsed(boolean isDbCycleUsed) {
-    this.isDbCycleUsed = isDbCycleUsed;
-  }
 }