Changeset 2618

Timestamp:

02/25/13 12:27:02 (11 years ago)

Author:

twagoo

Message:

Merged changes in Flex UI

Location:

ComponentRegistry/branches/ComponentRegistry-1.13.0/ComponentBrowserGui

Files:

• . (modified) (1 prop)
• pom.xml (modified) (2 diffs)
• src/main/flex/clarin/cmdi/componentregistry/common/AboutPopup.mxml (modified) (2 diffs)

ComponentRegistry/branches/ComponentRegistry-1.13.0/ComponentBrowserGui/pom.xml

@@ -73 +73 @@
         <sourceDirectory>src/main/flex</sourceDirectory>
         <plugins>
+           <!-- buildnumber plugin used to obtain this builds svn revision number -->
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>buildnumber-maven-plugin</artifactId>
+                <version>1.2</version>
+                <executions>
+                    <execution>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>create</goal>
+                        </goals>
+                        <configuration>
+                                <revisionOnScmFailure>no_revision</revisionOnScmFailure>
+                        </configuration>
+                    </execution>
+                </executions>
+                <configuration>
+                    <doCheck>false</doCheck>
+                    <doUpdate>false</doUpdate>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.sonatype.flexmojos</groupId>
@@ -86 +107 @@
                                                 <name>APPINFO::version</name>
                                                 <value>"${ComponentBrowserGui.version}"</value>
+                                          </property>
+                                          <property>
+                                                <name>APPINFO::revision</name>
+                                                <value>"${buildNumber}"</value>
                                           </property>
                                         </definesDeclaration>                    

ComponentRegistry/branches/ComponentRegistry-1.13.0/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/common/AboutPopup.mxml

@@ -19 +19 @@
                                 if(APPINFO != null){
                                         try{
-                                                version = APPINFO::version;
+                                                version = APPINFO::version + " (r" + APPINFO::revision + ")";
                                         } catch(err:ReferenceError){
                                                 // Version set at compilation
@@ -33 +33 @@
                                         + "\n"
                                         +"Version: " + version + "\n"
-                                        +"Written by: Patrick Duin and Twan Goosen\n"
+                                        +"Written by: Patrick Duin, Twan Goosen and Olha Shkaravska\n"
                                         +"\n"
                                         +"Go to <u><a target=\"_blank\" href=\"http://www.clarin.eu/cmdi\">www.clarin.eu/cmdi</a></u> for more information.\n"