vstorm83

public void testRebaseAfterRemoveNavigation()
   {
      new UnitTest()
      {
         public void execute() throws Exception
         {
            storage_.create(new PortalConfig("portal", "testRebaseAfterRemoveNavigation"));
            end(true);

            //

vstorm83

   public void testRenameNode() throws Exception
   {
      MOPService mop = mgr.getPOMService();
      Site portal = mop.getModel().getWorkspace().addSite(ObjectType.PORTAL_SITE, "rename_node2");
      portal.getRootNavigation().addChild("default");

      //
      sync(true);

      //

vstorm83

   public void testConsistentStateAfterRebase() throws Exception
   {
      MOPService mop = mgr.getPOMService();
      Site portal = mop.getModel().getWorkspace().addSite(ObjectType.PORTAL_SITE, "consistent_state_after_rebase");
      Navigation def = portal.getRootNavigation().addChild("default");
      def.addChild("a");

      //
      sync(true);

vstorm83

diff --git a/core/src/main/java/org/juzu/impl/plugin/ajax/ApplicationAsset.java b/core/src/main/java/org/juzu/impl/plugin/ajax/ApplicationAsset.java
index 85739cb..ada70f7 100644
--- a/core/src/main/java/org/juzu/impl/plugin/ajax/ApplicationAsset.java
+++ b/core/src/main/java/org/juzu/impl/plugin/ajax/ApplicationAsset.java
@@ -51,8 +51,10 @@ public class ApplicationAsset extends Route implements Provider<ApplicationAsset
       resp.setContentType("text/javascript");
       PrintWriter printer = resp.getWriter();
 
-      //
-      printer.println("HTMLElement.prototype." + scope + "=function(){");

vstorm83

diff --git a/core/src/main/java/juzu/impl/plugin/template/metamodel/TemplateResolver.java b/core/src/main/java/juzu/impl/plugin/template/metamodel/TemplateResolv
index e50e05d..4badab3 100644
--- a/core/src/main/java/juzu/impl/plugin/template/metamodel/TemplateResolver.java
+++ b/core/src/main/java/juzu/impl/plugin/template/metamodel/TemplateResolver.java
@@ -165,7 +165,7 @@ public class TemplateResolver implements Serializable {
       final Element[] elements = new Element[types.size()];
       int index = 0;
       for (Name type : types) {
-        elements[index++] = context.getTypeElement(type.getIdentifier());
+        elements[index++] = context.getTypeElement(type.toString());

vstorm83

diff --git a/home/phuongvv/Desktop/Classy Groundcovers - Finding Your Perfect Plants_files/dialog.js b/Classy Groundcovers - Finding Your Perfect Plants_files/dialog.js
index ee6badf..b941c2c 100644
--- a/home/phuongvv/Desktop/Classy Groundcovers - Finding Your Perfect Plants_files/dialog.js	
+++ b/Classy Groundcovers - Finding Your Perfect Plants_files/dialog.js	
@@ -18,6 +18,7 @@ $(function() {
 		} else if (typeof (r.w) === 'number') {
 			w = r.w;
 		}
+		var $link = $(this);
 		d

vstorm83

diff --git a/core/src/main/java/juzu/impl/plugin/asset/AssetResolver.java b/core/src/main/java/juzu/impl/plugin/asset/AssetResolver.java
index e032169..8b7b7e2 100644
--- a/core/src/main/java/juzu/impl/plugin/asset/AssetResolver.java
+++ b/core/src/main/java/juzu/impl/plugin/asset/AssetResolver.java
@@ -15,12 +15,12 @@
  */
 package juzu.impl.plugin.asset;
 
-import juzu.asset.AssetLocation;
-import juzu.impl.resource.ResourceResolver;

vstorm83

@@ -25,21 +25,23 @@ import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.TreeMap;
 
 import org.exoplatform.portal.config.model.Application;
+import org.exoplatform.portal.config.model.TransientApplicationState;
 
 public class AddOnServiceImpl implements AddOnService {

vstorm83

diff --git a/sampleAddon-extension-config/src/main/resources/conf/configuration.xml b/sampleAddon-extension-config/src/main/resources/conf/configuration.xml
index 6c3e4ed..cff1a74 100644
--- a/sampleAddon-extension-config/src/main/resources/conf/configuration.xml
+++ b/sampleAddon-extension-config/src/main/resources/conf/configuration.xml
@@ -12,37 +12,37 @@
 	http://www.fsf.org. -->
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_2.xsd http://www.exoplaform.org/xml/ns/kernel_1_2.xsd"
-	xmlns="http://www.exoplaform.org/xml/ns/kernel_1_2.xsd">

vstorm83

package org.exoplatform.web.security;

import java.util.LinkedList;
import java.util.List;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicInteger;

import junit.framework.TestCase;

import org.exoplatform.services.security.ConversationState;