LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Korrektur am Upgrade ccm-cms-6.6.4-6.6.5 

git-svn-id: https://svn.libreccm.org/ccm/trunk@1749 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2012-07-05 05:45:07 +00:00
parent 0da59542fb
commit 0a8632bb26
10 changed files with 17 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ccm-cms/src/ccm-cms.upgrade
View File

@ -52,14 +52,7 @@
<script sql="ccm-cms/upgrade/::database::-6.6.3-6.6.4.sql"/>
</version>
<version from="6.6.4" to="6.6.5">
<script class="com.arsdigita.cms.contenttypes.upgrades.CreateContactBundles"/>
<script class="com.arsdigita.cms.contenttypes.upgrades.CreateOrgaUnitBundles"/>
<script class="com.arsdigita.cms.contenttypes.upgrades.CreatePersonBundles"/>
<script class="com.arsdigita.cms.contenttypes.upgrades.GenericContactGenericPersonAssocUpgrade"/>
<script class="com.arsdigita.cms.contenttypes.upgrades.GenericOrgaUnitGenericContactAssocUpgrade"/>
<script class="com.arsdigita.cms.contenttypes.upgrades.GenericOrgaUnitGenericOrgaUnitAssocUpgrade"/>
<script class="com.arsdigita.cms.contenttypes.upgrades.GenericOrgaUnitGenericPersonAssocUpgrade"/>
<script sql="ccm-cms/upgrade::database::-6.6.4-6.6.5.sql"/>
<script class="com.arsdigita.cms.contenttypes.upgrades.Upgrade664to665"/>
</version>
<version from="6.6.5" to="6.6.6">
<!-- ContentSection now loaded as legacy free application -->

13
ccm-cms/src/com/arsdigita/cms/contenttypes/upgrades/AbstractAssocUpgrade.java
View File

@ -1,7 +1,6 @@
package com.arsdigita.cms.contenttypes.upgrades;
import com.arsdigita.runtime.RuntimeConfig;
import com.arsdigita.util.cmd.Program;
import com.arsdigita.util.jdbc.Connections;
import java.math.BigDecimal;
import java.sql.Connection;
@ -13,17 +12,16 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.commons.cli.CommandLine;
/**
*
* @author Jens Pelzetter
* @version $Id$
*/
public abstract class AbstractAssocUpgrade extends Program {
public abstract class AbstractAssocUpgrade {
public AbstractAssocUpgrade(final String name, final String version, final String usage) {
super(name, version, usage);
public AbstractAssocUpgrade() {
//Nothing
}
protected abstract String getTableName();
@ -43,9 +41,8 @@ public abstract class AbstractAssocUpgrade extends Program {
protected abstract String getOwnerTableName();
protected abstract String getMemberTableName();
@Override
protected void doRun(final CommandLine cmdLine) {
protected void doUpgrade() {
System.out.println("Starting upgrade...");
final List<AssocEntry> oldData = new ArrayList<AssocEntry>();

16
ccm-cms/src/com/arsdigita/cms/contenttypes/upgrades/AbstractBundleUpgrade.java
View File

@ -1,25 +1,19 @@
package com.arsdigita.cms.contenttypes.upgrades;
import com.arsdigita.runtime.RuntimeConfig;
import com.arsdigita.util.cmd.Program;
import com.arsdigita.util.jdbc.Connections;
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import org.apache.commons.cli.CommandLine;
/**
*
* @author Jens Pelzetter
* @version $Id$
*/
public abstract class AbstractBundleUpgrade extends Program {
public AbstractBundleUpgrade(final String name, final String version, final String usage) {
super(name, version, usage);
}
public abstract class AbstractBundleUpgrade {
protected abstract String getBundleTableName();
protected abstract String getContentItemTableName();
@ -35,9 +29,8 @@ public abstract class AbstractBundleUpgrade extends Program {
protected String getSuperBundleTable() {
return "cms_bundles";
}
@Override
public void doRun(final CommandLine cmdLine) {
public void doUpgrade() {
System.out.println("Starting upgrade...");
System.out.println("Trying to get JDBC connection...");
@ -137,6 +130,7 @@ public abstract class AbstractBundleUpgrade extends Program {
private void rollback(final Connection conn) {
try {
System.err.println("WARNING: Rollback.");
conn.rollback();
} catch (SQLException ex1) {
System.err.println("Rollback failed.");

10
ccm-cms/src/com/arsdigita/cms/contenttypes/upgrades/CreateContactBundles.java
View File

@ -8,15 +8,7 @@ import com.arsdigita.cms.contenttypes.GenericContactBundle;
* @version $Id$
*/
public class CreateContactBundles extends AbstractBundleUpgrade {
public CreateContactBundles() {
super("CreateContactBundles", "1.0.0", "");
}
public static void main(final String args[]) {
new CreateContactBundles().run(args);
}
@Override
protected String getBundleTableName() {
return "cms_contact_bundles";

10
ccm-cms/src/com/arsdigita/cms/contenttypes/upgrades/CreateOrgaUnitBundles.java
View File

@ -8,15 +8,7 @@ import com.arsdigita.cms.contenttypes.GenericOrganizationalUnitBundle;
* @version $Id$
*/
public class CreateOrgaUnitBundles extends AbstractBundleUpgrade {
public CreateOrgaUnitBundles() {
super("CreateOrgaUnitBundles", "1.0.0", "");
}
public static void main(final String args[]) {
new CreateOrgaUnitBundles().run(args);
}
@Override
protected String getBundleTableName() {
return "cms_orgaunit_bundles";

8
ccm-cms/src/com/arsdigita/cms/contenttypes/upgrades/CreatePersonBundles.java
View File

@ -9,15 +9,7 @@ import com.arsdigita.cms.contenttypes.GenericPersonBundle;
* @version $Id$
*/
public class CreatePersonBundles extends AbstractBundleUpgrade {
public CreatePersonBundles() {
super("CreatePersonBundles", "1.0.0", "");
}
public static void main(final String args[]) {
new CreatePersonBundles().run(args);
}
@Override
protected String getBundleTableName() {
return "cms_person_bundles";

10
ccm-cms/src/com/arsdigita/cms/contenttypes/upgrades/GenericContactGenericPersonAssocUpgrade.java
View File

@ -9,15 +9,7 @@ import java.util.Map;
* @version $Id$
*/
public class GenericContactGenericPersonAssocUpgrade extends AbstractAssocUpgrade {
public GenericContactGenericPersonAssocUpgrade() {
super("GenericContactGenericPersonAssocUpgrade", "1.0.0", "");
}
public static void main(final String[] args) {
new GenericContactGenericPersonAssocUpgrade().run(args);
}
@Override
protected String getTableName() {
return "cms_person_contact_map";

10
ccm-cms/src/com/arsdigita/cms/contenttypes/upgrades/GenericOrgaUnitGenericContactAssocUpgrade.java
View File

@ -9,15 +9,7 @@ import java.util.Map;
* @version $Id$
*/
public class GenericOrgaUnitGenericContactAssocUpgrade extends AbstractAssocUpgrade {
public GenericOrgaUnitGenericContactAssocUpgrade() {
super("GenericOrgaUnitGenericContactAssocUpgrade", "1.0.0", "");
}
public static void main(final String args[]) {
new GenericOrgaUnitGenericContactAssocUpgrade().run(args);
}
@Override
protected String getTableName() {
return "cms_organizationalunits_contact_map";

10
ccm-cms/src/com/arsdigita/cms/contenttypes/upgrades/GenericOrgaUnitGenericOrgaUnitAssocUpgrade.java
View File

@ -9,15 +9,7 @@ import java.util.Map;
* @version $Id$
*/
public class GenericOrgaUnitGenericOrgaUnitAssocUpgrade extends AbstractAssocUpgrade {
public GenericOrgaUnitGenericOrgaUnitAssocUpgrade() {
super("GenericOrgaUnitGenericOrgaUnitAssocUpgrade", "1.0.0", "");
}
public static void main(final String args[]) {
new GenericOrgaUnitGenericOrgaUnitAssocUpgrade().run(args);
}
@Override
protected String getTableName() {
return "cms_organizationalunits_hierarchy_map";

10
ccm-cms/src/com/arsdigita/cms/contenttypes/upgrades/GenericOrgaUnitGenericPersonAssocUpgrade.java
View File

@ -9,15 +9,7 @@ import java.util.Map;
* @version $Id$
*/
public class GenericOrgaUnitGenericPersonAssocUpgrade extends AbstractAssocUpgrade {
public GenericOrgaUnitGenericPersonAssocUpgrade() {
super("GenericOrgaUnitGenericPersonAssocUpgrade", "1.0.0", "");
}
public static void main(final String args[]) {
new GenericContactGenericPersonAssocUpgrade().run(args);
}
@Override
protected String getTableName() {
return "cms_organizationalunits_person_map";