=== removed file 'local/in/dhis-web-survey/src/main/java/org/hisp/dhis/detarget/action/GetMesageAction.java'
--- local/in/dhis-web-survey/src/main/java/org/hisp/dhis/detarget/action/GetMesageAction.java	2011-01-15 11:35:42 +0000
+++ local/in/dhis-web-survey/src/main/java/org/hisp/dhis/detarget/action/GetMesageAction.java	1970-01-01 00:00:00 +0000
@@ -1,145 +0,0 @@
-package org.hisp.dhis.detarget.action;
-
-/*
- * Copyright (c) 2004-2007, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- * * Neither the name of the HISP project nor the names of its contributors may
- *   be used to endorse or promote products derived from this software without
- *   specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import org.hisp.dhis.dataelement.DataElement;
-import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
-import org.hisp.dhis.dataelement.DataElementCategoryService;
-import org.hisp.dhis.dataelement.DataElementService;
-import org.hisp.dhis.target.DeTargetMapping;
-import org.hisp.dhis.target.DeTargetMappingService;
-
-import com.opensymphony.xwork2.Action;
-
-public class GetMesageAction
-    implements Action
-{
-    // -------------------------------------------------------------------------
-    // Dependencies
-    // -------------------------------------------------------------------------
-
-    
-    private DeTargetMappingService deTargetMappingService;
-    
-    public void setDeTargetMappingService( DeTargetMappingService deTargetMappingService )
-    {
-        this.deTargetMappingService = deTargetMappingService;
-    }
-    
-    
-    /*
-    private DeTargetMappingService deTargetMappingService;
-
-    public void setDeTargetMappingService( DeTargetMappingService deTargetMappingService )
-    {
-        this.deTargetMappingService = deTargetMappingService;
-    }
-    */
-    
-    private DataElementService dataElementService;
-
-    public void setDataElementService( DataElementService dataElementService )
-    {
-        this.dataElementService = dataElementService;
-    }
-    
-    private DataElementCategoryService dataElementCategoryService;
-
-    public void setDataElementCategoryService( DataElementCategoryService dataElementCategoryService )
-    {
-        this.dataElementCategoryService = dataElementCategoryService;
-    }
-
-    // -------------------------------------------------------------------------
-    // Input/output
-    // -------------------------------------------------------------------------
-
-    private String id;
-    
-    public void setId( String id )
-    {
-        this.id = id;
-    }
-    
-    private String dename;
-    
-    public String getDename()
-    {
-        return dename;
-    }
-    
-    private String targetname;
-    
-    public String getTargetname()
-    {
-        return targetname;
-    }
-    
-    private String targetid;
-    
-    public String getTargetid()
-    {
-        return targetid;
-    }
-    
-    // -------------------------------------------------------------------------
-    // Action implementation
-    // -------------------------------------------------------------------------
-
-    public String execute()
-        throws Exception
-    {
-        System.out.println("Inside GetMessage Action");
-        
-        String[] de_option = id.split( ":" );
-        int deid = Integer.parseInt( de_option[0] );
-        int optioncomboid = Integer.parseInt( de_option[1] );
-        
-        DataElement de = dataElementService.getDataElement( deid );
-        DataElementCategoryOptionCombo deoptioncombo = dataElementCategoryService.getDataElementCategoryOptionCombo( optioncomboid );
-                
-        DeTargetMapping deTargetMapping = deTargetMappingService.getDeTargetMapping( de, deoptioncombo );
-                
-        dename = de.getName() + ":" + deoptioncombo.getName();
-               
-        if ( deTargetMapping == null )
-        {
-         
-            targetname = "None";
-            targetid = "-1";
-        }
-        else
-        {
-            targetname = deTargetMapping.getTargetDataelement().getName();
-            targetid = "" + deTargetMapping.getTargetDataelement().getId() + ":" + deTargetMapping.getTargetoptioncombo().getId();
-        }
-        
-        System.out.println(dename + " : " + targetname);
-        return SUCCESS;
-    }
-}

=== added file 'local/in/dhis-web-survey/src/main/java/org/hisp/dhis/detarget/action/GetMessageAction.java'
--- local/in/dhis-web-survey/src/main/java/org/hisp/dhis/detarget/action/GetMessageAction.java	1970-01-01 00:00:00 +0000
+++ local/in/dhis-web-survey/src/main/java/org/hisp/dhis/detarget/action/GetMessageAction.java	2011-01-18 11:50:14 +0000
@@ -0,0 +1,145 @@
+package org.hisp.dhis.detarget.action;
+
+/*
+ * Copyright (c) 2004-2007, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ * * Neither the name of the HISP project nor the names of its contributors may
+ *   be used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+import org.hisp.dhis.dataelement.DataElement;
+import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
+import org.hisp.dhis.dataelement.DataElementCategoryService;
+import org.hisp.dhis.dataelement.DataElementService;
+import org.hisp.dhis.target.DeTargetMapping;
+import org.hisp.dhis.target.DeTargetMappingService;
+
+import com.opensymphony.xwork2.Action;
+
+public class GetMessageAction
+    implements Action
+{
+    // -------------------------------------------------------------------------
+    // Dependencies
+    // -------------------------------------------------------------------------
+
+    
+    private DeTargetMappingService deTargetMappingService;
+    
+    public void setDeTargetMappingService( DeTargetMappingService deTargetMappingService )
+    {
+        this.deTargetMappingService = deTargetMappingService;
+    }
+    
+    
+    /*
+    private DeTargetMappingService deTargetMappingService;
+
+    public void setDeTargetMappingService( DeTargetMappingService deTargetMappingService )
+    {
+        this.deTargetMappingService = deTargetMappingService;
+    }
+    */
+    
+    private DataElementService dataElementService;
+
+    public void setDataElementService( DataElementService dataElementService )
+    {
+        this.dataElementService = dataElementService;
+    }
+    
+    private DataElementCategoryService dataElementCategoryService;
+
+    public void setDataElementCategoryService( DataElementCategoryService dataElementCategoryService )
+    {
+        this.dataElementCategoryService = dataElementCategoryService;
+    }
+
+    // -------------------------------------------------------------------------
+    // Input/output
+    // -------------------------------------------------------------------------
+
+    private String id;
+    
+    public void setId( String id )
+    {
+        this.id = id;
+    }
+    
+    private String dename;
+    
+    public String getDename()
+    {
+        return dename;
+    }
+    
+    private String targetname;
+    
+    public String getTargetname()
+    {
+        return targetname;
+    }
+    
+    private String targetid;
+    
+    public String getTargetid()
+    {
+        return targetid;
+    }
+    
+    // -------------------------------------------------------------------------
+    // Action implementation
+    // -------------------------------------------------------------------------
+
+    public String execute()
+        throws Exception
+    {
+        System.out.println("Inside GetMessage Action");
+        
+        String[] de_option = id.split( ":" );
+        int deid = Integer.parseInt( de_option[0] );
+        int optioncomboid = Integer.parseInt( de_option[1] );
+        
+        DataElement de = dataElementService.getDataElement( deid );
+        DataElementCategoryOptionCombo deoptioncombo = dataElementCategoryService.getDataElementCategoryOptionCombo( optioncomboid );
+                
+        DeTargetMapping deTargetMapping = deTargetMappingService.getDeTargetMapping( de, deoptioncombo );
+                
+        dename = de.getName() + ":" + deoptioncombo.getName();
+               
+        if ( deTargetMapping == null )
+        {
+         
+            targetname = "None";
+            targetid = "-1";
+        }
+        else
+        {
+            targetname = deTargetMapping.getTargetDataelement().getName();
+            targetid = "" + deTargetMapping.getTargetDataelement().getId() + ":" + deTargetMapping.getTargetoptioncombo().getId();
+        }
+        
+        System.out.println(dename + " : " + targetname);
+        return SUCCESS;
+    }
+}

=== modified file 'local/in/dhis-web-survey/src/main/resources/META-INF/dhis/beans.xml'
--- local/in/dhis-web-survey/src/main/resources/META-INF/dhis/beans.xml	2011-01-17 07:45:29 +0000
+++ local/in/dhis-web-survey/src/main/resources/META-INF/dhis/beans.xml	2011-01-18 11:50:14 +0000
@@ -267,7 +267,7 @@
   </bean>
     
     <bean id="org.hisp.dhis.detarget.action.GenerateTargetAction"
-    class="org.hisp.dhis.target.action.GenerateTargetAction" 
+    class="org.hisp.dhis.detarget.action.GenerateTargetAction" 
     scope="prototype">
     <property name="dataElementService"
       ref="org.hisp.dhis.dataelement.DataElementService"/> 
@@ -295,8 +295,8 @@
       ref="org.hisp.dhis.dataelement.DataElementCategoryService"/>       
   </bean>
         
-    <bean id="org.hisp.dhis.detarget.action.GetMesageAction"
-    class="org.hisp.dhis.target.deaction.GetMesageAction" 
+    <bean id="org.hisp.dhis.detarget.action.GetMessageAction"
+    class="org.hisp.dhis.detarget.action.GetMessageAction" 
     scope="prototype">
     <property name="dataElementService"
       ref="org.hisp.dhis.dataelement.DataElementService"/>