OC 6905 v1.1

.gitignore

@@ -7,3 +7,6 @@ release.properties
 .classpath
 .project
 .settings/
+designer.log
+.idea/
+Designer.iml

.hgignore

@@ -0,0 +1,4 @@
+syntax: glob
+target
+*.class
+designer.log

.travis.yml

@@ -0,0 +1 @@
+language: java

pom.xml

@@ -4,7 +4,7 @@
     <groupId>org.akaza.openclinica.designer</groupId>
     <artifactId>Designer</artifactId>
     <packaging>war</packaging>
-    <version>1.1</version>
+    <version>SNAPSHOT</version>
     <name>Designer</name>
     <properties>
         <roo.version>1.1.5.RELEASE</roo.version>
@@ -14,9 +14,19 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	    <spring-security.version>3.0.5.RELEASE</spring-security.version>
 	    <logback.version>0.9.28</logback.version>
+   		<!--scm.path>scm:svn:http://svn.akazaresearch.com/openclinica-projects-prop/Designer/trunk</scm.path-->
+
         <scm.path>scm:git:https://github.com/OpenClinica/Designer.git</scm.path>
     </properties>
 	<repositories>
+        <repository>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+            <id>central</id>
+            <name>libs-release</name>
+            <url>https://dev.openclinica.com/artifactory/libs-release</url>
+        </repository>
         <repository>
             <id>spring-maven-release</id>
             <name>Spring Maven Release Repository</name>
@@ -46,6 +56,10 @@
                 <enabled>false</enabled>
             </snapshots>     
         </repository>
+        <repository>
+            <id>maven-central</id>
+            <url>http://repo1.maven.org/maven2</url>
+        </repository>
         <repository>
             <id>Akaza Dev Repository</id>
             <url>http://svn.akazaresearch.com/ocrepository/repository</url>
@@ -321,6 +335,21 @@
             <artifactId>tiles-jsp</artifactId>
             <version>2.2.1</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.tiles</groupId>
+            <artifactId>tiles-api</artifactId>
+            <version>2.2.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tiles</groupId>
+            <artifactId>tiles-servlet</artifactId>
+            <version>2.2.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tiles</groupId>
+            <artifactId>tiles-template</artifactId>
+            <version>2.2.1</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
@@ -479,11 +508,16 @@
         <dependency>
             <groupId>org.akaza.openclinica.odm</groupId>
             <artifactId>openclinica-odm</artifactId>
-            <version>0.1.0.BUILD-SNAPSHOT</version>
+            <version>2.0</version>
             <type>jar</type>
             <scope>compile</scope>
         </dependency>
         <!-- Jackson JSON Mapper -->
+        <dependency>
+            <groupId>org.codehaus.jackson</groupId>
+            <artifactId>jackson-core-asl</artifactId>
+            <version>1.5.3</version>
+        </dependency>
         <dependency>
             <groupId>org.codehaus.jackson</groupId>
             <artifactId>jackson-mapper-asl</artifactId>
@@ -506,21 +540,41 @@
             <artifactId>commons-httpclient</artifactId>
             <version>3.1</version>
         </dependency>
+        <dependency>
+            <groupId>commons-validator</groupId>
+            <artifactId>commons-validator</artifactId>
+            <version>1.4.1</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework.security.oauth</groupId>
             <artifactId>spring-security-oauth</artifactId>
             <version>1.0.0.M2</version>
         </dependency>
-         <dependency>
+        <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
             <version>4.1</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpcore</artifactId>
+            <version>4.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.ow2.asm</groupId>
+            <artifactId>asm</artifactId>
+            <version>3.2</version>
+        </dependency>
         <dependency>
         	<groupId>org.codehaus.groovy</groupId>
 			<artifactId>groovy</artifactId>
 			<version>1.8.0</version> 
         </dependency>
+        <dependency>
+            <groupId>commons-beanutils</groupId>
+            <artifactId>commons-beanutils-core</artifactId>
+            <version>1.8.3</version>
+        </dependency>
     </dependencies>
 	<build>
 		<plugins>
@@ -712,6 +766,12 @@
                             <doCheck>false</doCheck>
                             <doUpdate>false</doUpdate>
                             <buildNumberPropertyName>changeSet</buildNumberPropertyName>
+                            <!--timestampFormat>"yyyy-MM-dd HH:mm Z"</timestampFormat-->
+                            <!--format>{0} {1,date,yyyy-MM-dd HH:mm Z}</format>
+                            <items>
+                                <item>buildNumber</item>
+                                <item>timestamp</item>
+                            </items-->
                         </configuration>
                      </execution>
                      <execution>
@@ -723,9 +783,15 @@
                         <configuration>
                             <timestampPropertyName>changeSetDate</timestampPropertyName>
                             <timestampFormat>yyyy-MM-dd HH:mm Z</timestampFormat>
+                            <!--format>{0} {1,date,yyyy-MM-dd HH:mm Z}</format>
+                            <items>
+                                <item>buildNumber</item>
+                                <item>timestamp</item>
+                            </items-->
                         </configuration>
                     </execution>
                 </executions>
+
             </plugin>
         </plugins>
         <resources>
@@ -734,13 +800,15 @@
                 <filtering>true</filtering>
                 <includes>
                     <include>**/*.properties</include>
+                    <include>**/*.xml</include>
                 </includes>
             </resource>
             <resource>
                 <directory>src/main/resources</directory>
                 <filtering>false</filtering>
                 <excludes>
                     <exclude>**/*.properties</exclude>
+                    <exclude>**/*.xml</exclude>
                 </excludes>
             </resource>
         </resources>

src/assemble/designer-assemble.xml

@@ -16,4 +16,8 @@
             <destName>Designer-${project.version}.war</destName>
         </file>
     </files>
-</assembly>
+<<<<<<< HEAD
+</assembly>
+=======
+</assembly>
+>>>>>>> 1.1

src/bin/org/akaza/openclinica/designer/web/controller/ApplicationConversionServiceFactoryBean_Roo_ConversionService.aj

@@ -0,0 +1,13 @@
+// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
+// You may push code into the target .java compilation unit if you wish to edit any member(s).
+
+package org.akaza.openclinica.designer.web.controller;
+
+
+privileged aspect ApplicationConversionServiceFactoryBean_Roo_ConversionService {
+
+    public void ApplicationConversionServiceFactoryBean.afterPropertiesSet() {
+        super.afterPropertiesSet();
+    }
+
+}

src/main/java/org/akaza/openclinica/designer/web/controller/AccessResourceController.java

@@ -47,6 +47,8 @@ public class AccessResourceController {
     private static final String PARAM_APP_PATH = "path";
     private static final String PARAM_STUDY_OID = "study_oid";
     private static final String PARAM_PROVIDER_USER = "provider_user";
+    private static final String PARAM_RUN_TIME = "runTime";
+    private static final String PARAM_MESSAGE = "msg";
     private static final String SESSION_ATTR_FORM = "form";
 
     protected final Logger logger = LoggerFactory.getLogger(getClass().getName());
@@ -59,14 +61,17 @@ public AccessResourceController() {
     public String createForm(Model model, HttpSession session, HttpServletRequest request, @RequestParam(PARAM_HOST) String providerHost,
             @RequestParam(PARAM_APP) String providerApp, @RequestParam(PARAM_STUDY_OID) String studyOid,
             @RequestParam(PARAM_PROVIDER_USER) String providerUser, @RequestParam(value = PARAM_APP_PATH, required = false) String path,
-            @RequestParam(value = PARAM_RULE_OID, required = false) String ruleOid, @RequestParam(value = PARAM_TARGET, required = false) String target)
+            @RequestParam(value = PARAM_RULE_OID, required = false) String ruleOid, @RequestParam(value = PARAM_TARGET, required = false) String target, @RequestParam(value = PARAM_RUN_TIME, required = false) String runTime, @RequestParam(value = PARAM_MESSAGE, required = false) String message)
             throws Exception {
 
         if (!hostAccessService.isHostAllowedAccess(providerHost)) {
             return "index";
         }
         logger.debug("Host is Valid ...");
-
+        if (message != null) {
+            message = message.replace("-0-","\n");
+            message = message.replace("-1-"," ");
+        }
         userPreferences.setAppName(providerApp);
         userPreferences.setPath(path);
         userPreferences.setUser(providerUser);
@@ -81,7 +86,7 @@ public String createForm(Model model, HttpSession session, HttpServletRequest re
         session.setAttribute("providerUser", userPreferences.getUser());
         session.setAttribute("providerHost", userPreferences.getHost());
         if (ruleOid != null && target != null) {
-            session.setAttribute(SESSION_ATTR_FORM, uiODMBuilder.getContainer().getRuleCommandByRuleOidAndTarget(ruleOid, target));
+            session.setAttribute(SESSION_ATTR_FORM, uiODMBuilder.getContainer().getRuleCommandByRuleOidAndTarget(ruleOid, target, runTime, message));
             userPreferences.turnOnEditMode();
         }
         // doRest();

src/main/java/org/akaza/openclinica/designer/web/controller/LazyEventActionType.java

@@ -0,0 +1,37 @@
+package org.akaza.openclinica.designer.web.controller;
+
+import org.openclinica.ns.rules.v31.EventActionType;
+import org.openclinica.ns.rules.v31.EventDestinationType;
+import org.springframework.util.AutoPopulatingList;
+
+public class LazyEventActionType extends EventActionType {
+
+    private AutoPopulatingList<LazyEventDestinationType> lazyProperties;
+
+    public LazyEventActionType() {
+        // TODO Auto-generated constructor stub
+        // destinationProperty = new ArrayList<PropertyType>();
+        lazyProperties = new AutoPopulatingList(LazyEventDestinationType.class);
+    }
+
+    public LazyEventActionType(EventActionType eventActionType) {
+        this();
+        this.setIfExpressionEvaluates(eventActionType.getIfExpressionEvaluates());
+        this.setOID(eventActionType.getOID());
+        this.setRunOnStatus(eventActionType.getRunOnStatus());
+        this.getEventDestination().addAll(eventActionType.getEventDestination());
+        for (EventDestinationType eventDestinationType : this.getEventDestination()) {
+            LazyEventDestinationType lazyEventDestination = new LazyEventDestinationType(eventDestinationType, "placeHolder");
+            getLazyProperties().add(lazyEventDestination);
+        }
+    }
+
+    public AutoPopulatingList<LazyEventDestinationType> getLazyProperties() {
+        return lazyProperties;
+    }
+
+    public void setLazyProperties(AutoPopulatingList<LazyEventDestinationType> lazyProperties) {
+        this.lazyProperties = lazyProperties;
+    }
+
+}

src/main/java/org/akaza/openclinica/designer/web/controller/LazyEventDestinationType.java

@@ -0,0 +1,27 @@
+package org.akaza.openclinica.designer.web.controller;
+
+import org.openclinica.ns.rules.v31.EventDestinationType;
+
+public class LazyEventDestinationType extends EventDestinationType {
+
+    String placeHolder;
+
+    public LazyEventDestinationType() {
+        // TODO Auto-generated constructor stub
+    }
+
+    public LazyEventDestinationType(EventDestinationType eventDestinationType, String placeHolder) {
+        this.setProperty(eventDestinationType.getProperty());
+        this.setValueExpression(eventDestinationType.getValueExpression());
+        this.placeHolder = placeHolder;
+    }
+
+    public String getPlaceHolder() {
+        return placeHolder;
+    }
+
+    public void setPlaceHolder(String placeHolder) {
+        this.placeHolder = placeHolder;
+    }
+
+}