r3427 - in trunk: pollen-persistence/src/main/xmi pollen-services/src/main/java/org/chorem/pollen/entities/migration src/site src/site/resources/images - Pollen-commits

6 Jun 2012

Author: tchemit
Date: 2012-06-06 14:25:14 +0200 (Wed, 06 Jun 2012)
New Revision: 3427

Url: http://chorem.org/repositories/revision/pollen/3427

Log:
reuse common logos
add migration scripts to generate index (refs #583: Make sure pollId is never used twice)


Removed:
   trunk/src/site/resources/images/logos/
Modified:
   trunk/pollen-persistence/src/main/xmi/pollen.properties
   trunk/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_4.java
   trunk/src/site/site_en.xml
   trunk/src/site/site_fr.xml

Modified: trunk/pollen-persistence/src/main/xmi/pollen.properties
===================================================================

--- trunk/pollen-persistence/src/main/xmi/pollen.properties	2012-06-06 11:19:59 UTC (rev 3426)
+++ trunk/pollen-persistence/src/main/xmi/pollen.properties	2012-06-06 12:25:14 UTC (rev 3427)
@@ -40,6 +40,6 @@
 
 # clef naturelle non modifiable sur PollAccount#accountId
 org.chorem.pollen.business.persistence.PollAccount.class.tagValue.naturalIdMutable=true
-org.chorem.pollen.business.persistence.PollAccount.attribute.accountId.stereotype=unique
+#org.chorem.pollen.business.persistence.PollAccount.attribute.accountId.stereotype=unique
 org.chorem.pollen.business.persistence.PollAccount.attribute.accountId.tagValue.naturalId=true
 

Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_4.java
===================================================================
--- trunk/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_4.java	2012-06-06 11:19:59 UTC (rev 3426)
+++ trunk/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_4.java	2012-06-06 12:25:14 UTC (rev 3427)
@@ -91,8 +91,18 @@
 
         // generate missing thumbs
         generateMissingImageThumbs(tx);
+
+        // add unique on Poll.pollId and PollAccount.accountId (http://www.chorem.org/issues/583)
+        addUniqueOnPollAndPollAccountIds(queries);
     }
 
+    private void addUniqueOnPollAndPollAccountIds(List<String> queries) {
+
+        queries.add("CREATE UNIQUE INDEX idx_Pöll_pollId ON poll(pollId);");
+        queries.add("UPDATE pollaccount SET accountid = NULL WHERE accountid = '';");
+        queries.add("CREATE UNIQUE INDEX idx_PollAccount_accountId ON pollAccount(accountId);");
+    }
+
     private void generateMissingImageThumbs(TopiaContextImplementor tx) throws TopiaException {
         TopiaSQLQuery<Pair<String, String>> getAllImageChoicesQuery = new TopiaSQLQuery<Pair<String, String>>() {
 

Modified: trunk/src/site/site_en.xml
===================================================================
--- trunk/src/site/site_en.xml	2012-06-06 11:19:59 UTC (rev 3426)
+++ trunk/src/site/site_en.xml	2012-06-06 12:25:14 UTC (rev 3427)
@@ -56,23 +56,23 @@
 
   <poweredBy>
     <logo href="http://maven.apache.org" name="Maven"
-          img="images/logos/maven-feather.png"/>
+          img="${project.url}/images/logos/maven-feather.png"/>
 
     <logo href="http://struts.apache.org/" name="Struts 2"
-          img="images/logos/struts2-logo.png"/>
+          img="http://maven-site.nuiton.org/public/images/struts2-logo.png"/>
 
     <logo href="http://docutils.sourceforge.net/rst.html"
           name="ReStructuredText"
-          img="images/logos/restructuredtext-logo.png"/>
+          img="http://maven-site.nuiton.org/public/images/restructuredtext-logo.png"/>
 
     <logo href="http://maven-site.nuiton.org/jrst" name="JRst"
-          img="images/logos/jrst-logo.png"/>
+          img="http://maven-site.nuiton.org/public/images/jrst-logo.png"/>
 
     <logo href="http://maven-site.nuiton.org/topia" name="ToPIA"
-          img="images/logos/topia-logo.png"/>
+          img="http://maven-site.nuiton.org/public/images/topia-logo.png"/>
 
     <logo href="http://argouml.tigris.org/" name="ArgoUML"
-          img="images/logos/argouml-logo.png"/>
+          img="http://maven-site.nuiton.org/public/images/argouml-logo.png"/>
   </poweredBy>
 
   <body>

Modified: trunk/src/site/site_fr.xml
===================================================================
--- trunk/src/site/site_fr.xml	2012-06-06 11:19:59 UTC (rev 3426)
+++ trunk/src/site/site_fr.xml	2012-06-06 12:25:14 UTC (rev 3427)
@@ -59,20 +59,20 @@
           img="${project.url}/images/logos/maven-feather.png"/>
 
     <logo href="http://struts.apache.org/" name="Struts 2"
-          img="${project.url}/images/logos/struts2-logo.png"/>
+          img="http://maven-site.nuiton.org/public/images/logos/struts2-logo.png"/>
 
     <logo href="http://docutils.sourceforge.net/rst.html"
           name="ReStructuredText"
-          img="${project.url}/images/logos/restructuredtext-logo.png"/>
+          img="http://maven-site.nuiton.org/public/images/logos/restructuredtext-logo.png"/>
 
     <logo href="http://maven-site.nuiton.org/jrst" name="JRst"
-          img="${project.url}/images/logos/jrst-logo.png"/>
+          img="http://maven-site.nuiton.org/public/images/logos/jrst-logo.png"/>
 
     <logo href="http://maven-site.nuiton.org/topia" name="ToPIA"
-          img="${project.url}/images/logos/topia-logo.png"/>
+          img="http://maven-site.nuiton.org/public/images/logos/topia-logo.png"/>
 
     <logo href="http://argouml.tigris.org/" name="ArgoUML"
-          img="${project.url}/images/logos/argouml-logo.png"/>
+          img="http://maven-site.nuiton.org/public/images/logos/argouml-logo.png"/>
   </poweredBy>
 
   <body>

    

r3427 - in trunk: pollen-persistence/src/main/xmi pollen-services/src/main/java/org/chorem/pollen/entities/migration src/site src/site/resources/images

tchemit＠users.chorem.org

tags

participants (1)