gatein SVN: r5715 - in portal/branches/branch-GTNPORTAL-1745/gadgets: core/src/main/java/org/exoplatform/portal/gadget/core and 3 other directories.
by do-not-reply@jboss.org
Author: hoang_to
Date: 2011-01-10 06:31:22 -0500 (Mon, 10 Jan 2011)
New Revision: 5715
Added:
portal/branches/branch-GTNPORTAL-1745/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/GateInJsonContainerConfig.java
portal/branches/branch-GTNPORTAL-1745/gadgets/server/src/main/webapp/WEB-INF/classes/containers/
portal/branches/branch-GTNPORTAL-1745/gadgets/server/src/main/webapp/WEB-INF/classes/containers/default/
portal/branches/branch-GTNPORTAL-1745/gadgets/server/src/main/webapp/WEB-INF/classes/containers/default/container.js
Removed:
portal/branches/branch-GTNPORTAL-1745/gadgets/core/src/main/java/containers/default/container.js
Modified:
portal/branches/branch-GTNPORTAL-1745/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ExoContainerConfig.java
Log:
GTNPORTAL-1712: Move the Apache Shindig configuration out of the jar
Deleted: portal/branches/branch-GTNPORTAL-1745/gadgets/core/src/main/java/containers/default/container.js
===================================================================
--- portal/branches/branch-GTNPORTAL-1745/gadgets/core/src/main/java/containers/default/container.js 2011-01-10 11:20:24 UTC (rev 5714)
+++ portal/branches/branch-GTNPORTAL-1745/gadgets/core/src/main/java/containers/default/container.js 2011-01-10 11:31:22 UTC (rev 5715)
@@ -1,180 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-// Default container configuration. To change the configuration, you have two options:
-//
-// A. If you run the Java server: Create your own "myContainer.js" file and
-// modify the value in web.xml.
-//
-// B. If you run the PHP server: Create a myContainer.js, copy the contents of container.js to it,
-// change
-// {"gadgets.container" : ["default"],
-// to
-// {"gadgets.container" : ["myContainer"],
-// And make your changes that you need to myContainer.js.
-// Just make sure on the iframe URL you specify &container=myContainer
-// for it to use that config.
-//
-// All configurations will automatically inherit values from this
-// config, so you only need to provide configuration for items
-// that you require explicit special casing for.
-//
-// Please namespace your attributes using the same conventions
-// as you would for javascript objects, e.g. gadgets.features
-// rather than "features".
-
-// NOTE: Please _don't_ leave trailing commas because the php json parser
-// errors out on this.
-
-// Container must be an array; this allows multiple containers
-// to share configuration.
-{"gadgets.container" : ["default"],
-
-// Set of regular expressions to validate the parent parameter. This is
-// necessary to support situations where you want a single container to support
-// multiple possible host names (such as for localized domains, such as
-// <language>.example.org. If left as null, the parent parameter will be
-// ignored; otherwise, any requests that do not include a parent
-// value matching this set will return a 404 error.
-"gadgets.parent" : null,
-
-// Should all gadgets be forced on to a locked domain?
-"gadgets.lockedDomainRequired" : false,
-
-// DNS domain on which gadgets should render.
-"gadgets.lockedDomainSuffix" : "-a.example.com:8080",
-
-// Various urls generated throughout the code base.
-// iframeBaseUri will automatically have the host inserted
-// if locked domain is enabled and the implementation supports it.
-// query parameters will be added.
-"gadgets.iframeBaseUri" : "/eXoGadgetServer/gadgets/ifr",
-
-// jsUriTemplate will have %host% and %js% substituted.
-// No locked domain special cases, but jsUriTemplate must
-// never conflict with a lockedDomainSuffix.
-"gadgets.jsUriTemplate" : "http://%host%/eXoGadgetServer/gadgets/js/%js%",
-
-// Callback URL. Scheme relative URL for easy switch between https/http.
-"gadgets.oauthGadgetCallbackTemplate" : "//%host%/eXoGadgetServer/gadgets/oauthcallback",
-
-// Use an insecure security token by default
-"gadgets.securityTokenType" : "secure",
-"gadgets.securityTokenKeyFile" : "key.txt",
-
-"gadgets.signingKeyFile" : "oauthkey.pem",
-"gadgets.signingKeyName" : "mytestkey",
-
-"gadgets.signedFetchDomain" : "eXo",
-// Config param to load Opensocial data for social
-// preloads in data pipelining. %host% will be
-// substituted with the current host.
-"gadgets.osDataUri" : "http://%host%/social/rpc",
-
-// Uncomment these to switch to a secure version
-//
-//"gadgets.securityTokenType" : "secure",
-//"gadgets.securityTokenKeyFile" : "/path/to/key/file.txt",
-
-"gadgets.content-rewrite" : {
- "include-urls": ".*",
- "exclude-urls": "",
- "include-tags": ["link", "script", "embed", "img", "style"],
- "expires": "86400",
- "proxy-url": "/eXoGadgetServer/gadgets/proxy?url=",
- "concat-url": "/eXoGadgetServer/gadgets/concat?"
-},
-
-// This config data will be passed down to javascript. Please
-// configure your object using the feature name rather than
-// the javascript name.
-
-// Only configuration for required features will be used.
-// See individual feature.xml files for configuration details.
-"gadgets.features" : {
- "core.io" : {
- // Note: /proxy is an open proxy. Be careful how you expose this!
- "proxyUrl" : "http://%host%/eXoGadgetServer/gadgets/proxy?refresh=%refresh%&url=%url%",
- "jsonProxyUrl" : "http://%host%/eXoGadgetServer/gadgets/makeRequest"
- },
- "views" : {
- "home" : {
- "isOnlyVisible" : false,
- "urlTemplate" : "http://%host%/eXoGadgetServer/gadgets/home?{var}",
- "aliases": ["DASHBOARD", "default"]
- },
- "canvas" : {
- "isOnlyVisible" : true,
- "urlTemplate" : "http://%host%/eXoGadgetServer/gadgets/canvas?{var}",
- "aliases" : ["FULL_PAGE"]
- }
- },
- "rpc" : {
- // Path to the relay file. Automatically appended to the parent
- /// parameter if it passes input validation and is not null.
- // This should never be on the same host in a production environment!
- // Only use this for TESTING!
- "parentRelayUrl" : "/eXoGadgetServer/gadgets/files/container/rpc_relay.html",
-
- // If true, this will use the legacy ifpc wire format when making rpc
- // requests.
- "useLegacyProtocol" : false
- },
- // Skin defaults
- "skins" : {
- "properties" : {
- "BG_COLOR": "",
- "BG_IMAGE": "",
- "BG_POSITION": "",
- "BG_REPEAT": "",
- "FONT_COLOR": "",
- "ANCHOR_COLOR": ""
- }
- },
- "opensocial-0.8" : {
- // Path to fetch opensocial data from
- // Must be on the same domain as the gadget rendering server
- "path" : "http://%host%/social",
- "domain" : "shindig",
- "enableCaja" : false,
- "supportedFields" : {
- "person" : ["id", {"name" : ["familyName", "givenName", "unstructured"]}, "thumbnailUrl", "profileUrl"],
- "activity" : ["id", "title"]
- }
- },
- "osapi.services" : {
- // Specifying a binding to "container.listMethods" instructs osapi to dynamicaly introspect the services
- // provided by the container and delay the gadget onLoad handler until that introspection is
- // complete.
- // Alternatively a container can directly configure services here rather than having them
- // introspected. Simply list out the available servies and omit "container.listMethods" to
- // avoid the initialization delay caused by gadgets.rpc
- // E.g. "gadgets.rpc" : ["activities.requestCreate", "messages.requestSend", "requestShareApp", "requestPermission"]
- "gadgets.rpc" : ["container.listMethods"]
- },
-// "osapi" : {
-// // The endpoints to query for available JSONRPC/REST services
-// "endPoints" : [ "http://%host%/social/rpc", "http://%host%/gadgets/api/rpc" ]
-// },
- "osml": {
- // OSML library resource. Can be set to null or the empty string to disable OSML
- // for a container.
- "library": ""
- }
-}}
Modified: portal/branches/branch-GTNPORTAL-1745/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ExoContainerConfig.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1745/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ExoContainerConfig.java 2011-01-10 11:20:24 UTC (rev 5714)
+++ portal/branches/branch-GTNPORTAL-1745/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ExoContainerConfig.java 2011-01-10 11:31:22 UTC (rev 5715)
@@ -27,7 +27,6 @@
import org.apache.shindig.auth.BlobCrypterSecurityTokenDecoder;
import org.apache.shindig.config.ContainerConfigException;
-import org.apache.shindig.config.JsonContainerConfig;
import org.apache.shindig.expressions.Expressions;
import org.exoplatform.commons.utils.Safe;
import org.exoplatform.container.monitor.jvm.J2EEServerInfo;
@@ -62,7 +61,7 @@
@Singleton
public class
- ExoContainerConfig extends JsonContainerConfig
+ ExoContainerConfig extends GateInJsonContainerConfig
{
/** . */
Added: portal/branches/branch-GTNPORTAL-1745/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/GateInJsonContainerConfig.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1745/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/GateInJsonContainerConfig.java (rev 0)
+++ portal/branches/branch-GTNPORTAL-1745/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/GateInJsonContainerConfig.java 2011-01-10 11:31:22 UTC (rev 5715)
@@ -0,0 +1,382 @@
+package org.exoplatform.portal.gadget.core;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.shindig.common.JsonSerializer;
+import org.apache.shindig.common.util.ResourceLoader;
+import org.apache.shindig.config.AbstractContainerConfig;
+import org.apache.shindig.config.ContainerConfigELResolver;
+import org.apache.shindig.config.ContainerConfigException;
+import org.apache.shindig.config.DynamicConfigProperty;
+import org.apache.shindig.expressions.Expressions;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Maps;
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
+import com.google.inject.name.Named;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.logging.Logger;
+import java.util.logging.Level;
+
+import javax.el.ELContext;
+import javax.el.ELException;
+import javax.el.ValueExpression;
+
+/**
+ * A fork of the class JsonContainerConfig, designed to override the loading of container.js
+ *
+ * User: Minh Hoang TO - hoang281283(a)gmail.com
+ * Date: 1/10/11
+ * Time: 2:12 PM
+ */
+@Singleton
+public class GateInJsonContainerConfig extends AbstractContainerConfig {
+
+ private static final Logger LOG = Logger.getLogger(GateInJsonContainerConfig.class.getName());
+ public static final char FILE_SEPARATOR = ',';
+ public static final String PARENT_KEY = "parent";
+ // TODO: Rename this to simply "container", gadgets.container is unnecessary.
+ public static final String CONTAINER_KEY = "gadgets.container";
+
+ private final Map<String, Map<String, Object>> config;
+ private final Expressions expressions;
+
+ /**
+ * Creates a new configuration from files.
+ * @throws ContainerConfigException
+ */
+ @Inject
+ public GateInJsonContainerConfig(@Named("shindig.containers.default") String containers, Expressions expressions)
+ throws ContainerConfigException {
+ this.expressions = expressions;
+ config = createContainers(loadContainers(containers));
+ init();
+ }
+
+ /**
+ * Creates a new configuration from a JSON Object, for use in testing.
+ */
+ public GateInJsonContainerConfig(JSONObject json, Expressions expressions) {
+ this.expressions = expressions;
+ config = createContainers(json);
+ init();
+ }
+
+ /**
+ * Initializes the configuration. Called during construction.
+ */
+ protected void init() {
+ for (Map.Entry<String, Map<String, Object>> configEntry : config.entrySet()) {
+ @SuppressWarnings("unchecked")
+ Map<String, Object> value = (Map<String, Object>) evaluateAll(configEntry.getValue());
+ configEntry.setValue(value);
+ }
+ }
+
+ @Override
+ public Collection<String> getContainers() {
+ return Collections.unmodifiableSet(config.keySet());
+ }
+
+ @Override
+ public Map<String, Object> getProperties(String container) {
+ return config.get(container);
+ }
+
+ @Override
+ public Object getProperty(String container, String property) {
+ if (property.startsWith("${")) {
+ // An expression!
+ try {
+ ValueExpression expression = expressions.parse(property, Object.class);
+ return expression.getValue(createExpressionContext(container));
+ } catch (ELException e) {
+ return null;
+ }
+ }
+
+ Map<String, Object> containerData = config.get(container);
+ if (containerData == null) {
+ return null;
+ }
+ return containerData.get(property);
+ }
+
+ /**
+ * Initialize each container's configuration.
+ */
+ private Map<String, Map<String, Object>> createContainers(JSONObject json) {
+ Map<String, Map<String, Object>> map = Maps.newHashMap();
+ for (String container : JSONObject.getNames(json)) {
+ ELContext context = createExpressionContext(container);
+ map.put(container, jsonToMap(json.optJSONObject(container), expressions, context));
+ }
+
+ return map;
+ }
+
+ /**
+ * Make Expressions available to subclasses so they can create ELContexts
+ */
+ protected Expressions getExpressions() {
+ return expressions;
+ }
+
+ /**
+ * Protected to allow overriding.
+ */
+ protected ELContext createExpressionContext(String container) {
+ return getExpressions().newELContext(new ContainerConfigELResolver(this, container));
+ }
+
+ /**
+ * Convert a JSON value to a configuration value.
+ */
+ private static Object jsonToConfig(Object json, Expressions expressions, ELContext context) {
+ if (JSONObject.NULL.equals(json)) {
+ return null;
+ } else if (json instanceof CharSequence) {
+ return new DynamicConfigProperty(json.toString(), expressions, context);
+ } else if (json instanceof JSONArray) {
+ JSONArray jsonArray = (JSONArray) json;
+ List<Object> values = new ArrayList<Object>(jsonArray.length());
+ for (int i = 0, j = jsonArray.length(); i < j; ++i) {
+ values.add(jsonToConfig(jsonArray.opt(i), expressions, context));
+ }
+ return Collections.unmodifiableList(values);
+ } else if (json instanceof JSONObject) {
+ return jsonToMap((JSONObject) json, expressions, context);
+ }
+
+ // A (boxed) primitive.
+ return json;
+ }
+
+ private static Map<String, Object> jsonToMap(JSONObject json, Expressions expressions, ELContext context) {
+ Map<String, Object> values = new HashMap<String, Object>(json.length(), 1);
+ for (String key : JSONObject.getNames(json)) {
+ Object val = jsonToConfig(json.opt(key), expressions, context);
+ if (val != null) {
+ values.put(key, val);
+ }
+ }
+ return Collections.unmodifiableMap(values);
+ }
+
+ /**
+ * Loads containers from directories recursively.
+ *
+ * Only files with a .js or .json extension will be loaded.
+ *
+ * @param files The files to examine.
+ * @throws ContainerConfigException
+ */
+ private void loadFiles(File[] files, JSONObject all) throws ContainerConfigException {
+ try {
+ for (File file : files) {
+ LOG.info("Reading container config: " + file.getName());
+ if (file.isDirectory()) {
+ loadFiles(file.listFiles(), all);
+ } else if (file.getName().toLowerCase(Locale.ENGLISH).endsWith(".js") ||
+ file.getName().toLowerCase(Locale.ENGLISH).endsWith(".json")) {
+ if (!file.exists()) {
+ throw new ContainerConfigException(
+ "The file '" + file.getAbsolutePath() + "' doesn't exist.");
+ }
+ loadFromString(ResourceLoader.getContent(file), all);
+ } else {
+ if (LOG.isLoggable(Level.FINEST))
+ LOG.finest(file.getAbsolutePath() + " doesn't seem to be a JS or JSON file.");
+ }
+ }
+ } catch (IOException e) {
+ throw new ContainerConfigException(e);
+ }
+ }
+
+ /**
+ * Loads resources recursively.
+ * @param files The base paths to look for container.xml
+ * @throws ContainerConfigException
+ */
+ private void loadResources(String[] files, JSONObject all) throws ContainerConfigException {
+ try {
+ for (String entry : files) {
+ LOG.info("Reading container config: " + entry);
+ final ClassLoader contextCl = Thread.currentThread().getContextClassLoader();
+ LOG.info("Current context class loader " + contextCl.toString() + " type : " + contextCl.getClass());
+ InputStream resourceInputStream = contextCl.getResourceAsStream(entry);
+ String content = IOUtils.toString(resourceInputStream, "UTF-8");
+ loadFromString(content, all);
+ }
+ } catch (IOException e) {
+ throw new ContainerConfigException(e);
+ }
+ }
+
+ /**
+ * Merges two JSON objects together (recursively), with values from "merge"
+ * replacing values in "base" to produce a new object.
+ *
+ * @param base The base object that values will be replaced into.
+ * @param merge The object to merge values from.
+ *
+ * @throws JSONException if the two objects can't be merged for some reason.
+ */
+ private JSONObject mergeObjects(JSONObject base, JSONObject merge)
+ throws JSONException {
+ // Clone the initial object (JSONObject doesn't support "clone").
+
+ JSONObject clone = new JSONObject(base, JSONObject.getNames(base));
+ // Walk parameter list for the merged object and merge recursively.
+ String[] fields = JSONObject.getNames(merge);
+ for (String field : fields) {
+ Object existing = clone.opt(field);
+ Object update = merge.get(field);
+ if (JSONObject.NULL.equals(existing) || JSONObject.NULL.equals(update)) {
+ // It's new custom config, not referenced in the prototype, or
+ // it's removing a pre-configured value.
+ clone.put(field, update);
+ } else {
+ // Merge if object type is JSONObject.
+ if (update instanceof JSONObject &&
+ existing instanceof JSONObject) {
+ clone.put(field, mergeObjects((JSONObject)existing,
+ (JSONObject)update));
+ } else {
+ // Otherwise we just overwrite it.
+ clone.put(field, update);
+ }
+ }
+ }
+ return clone;
+ }
+
+ /**
+ * Recursively merge values from parent objects in the prototype chain.
+ *
+ * @return The object merged with all parents.
+ *
+ * @throws ContainerConfigException If there is an invalid parent parameter
+ * in the prototype chain.
+ */
+ private JSONObject mergeParents(String container, JSONObject all)
+ throws ContainerConfigException, JSONException {
+ JSONObject base = all.getJSONObject(container);
+ if (DEFAULT_CONTAINER.equals(container)) {
+ return base;
+ }
+
+ String parent = base.optString(PARENT_KEY, DEFAULT_CONTAINER);
+ if (!all.has(parent)) {
+ throw new ContainerConfigException(
+ "Unable to locate parent '" + parent + "' required by "
+ + base.getString(CONTAINER_KEY));
+ }
+ return mergeObjects(mergeParents(parent, all), base);
+ }
+
+ /**
+ * Processes a container file.
+ *
+ * @param json
+ * @throws ContainerConfigException
+ */
+ protected void loadFromString(String json, JSONObject all) throws ContainerConfigException {
+ try {
+ JSONObject contents = new JSONObject(json);
+ JSONArray containers = contents.getJSONArray(CONTAINER_KEY);
+
+ for (int i = 0, j = containers.length(); i < j; ++i) {
+ // Copy the default object and produce a new one.
+ String container = containers.getString(i);
+ all.put(container, contents);
+ }
+ } catch (JSONException e) {
+ throw new ContainerConfigException(e);
+ }
+ }
+
+ /**
+ * Loads containers from the specified resource. Follows the same rules
+ * as {@code JsFeatureLoader.loadFeatures} for locating resources.
+ *
+ * @param path
+ * @throws ContainerConfigException
+ */
+ private JSONObject loadContainers(String path) throws ContainerConfigException {
+ JSONObject all = new JSONObject();
+ try {
+ for (String location : StringUtils.split(path, FILE_SEPARATOR)) {
+ if (location.startsWith("res://")) {
+ location = location.substring(6);
+ LOG.info("Loading resources from: " + location);
+ if (path.endsWith(".txt")) {
+ loadResources(ResourceLoader.getContent(location).split("[\r\n]+"), all);
+ } else {
+ loadResources(new String[]{location}, all);
+ }
+ } else {
+ LOG.info("Loading files from: " + location);
+ File file = new File(location);
+ loadFiles(new File[]{file}, all);
+ }
+ }
+
+ // Now that all containers are loaded, we go back through them and merge
+ // recursively. This is done at startup to simplify lookups.
+ for (String container : JSONObject.getNames(all)) {
+ all.put(container, mergeParents(container, all));
+ }
+
+ return all;
+ } catch (IOException e) {
+ throw new ContainerConfigException(e);
+ } catch (JSONException e) {
+ throw new ContainerConfigException(e);
+ }
+ }
+
+ @Override
+ public String toString() {
+ return JsonSerializer.serialize(config);
+ }
+
+ private Object evaluateAll(Object value) {
+ if (value instanceof CharSequence) {
+ return value.toString();
+ } else if (value instanceof Map) {
+ ImmutableMap.Builder<Object, Object> newMap = ImmutableMap.builder();
+ for (Map.Entry<?, ?> entry : ((Map<?, ?>) value).entrySet()) {
+ newMap.put(entry.getKey(), evaluateAll(entry.getValue()));
+ }
+
+ return newMap.build();
+ } else if (value instanceof List) {
+ ImmutableList.Builder<Object> newList = ImmutableList.builder();
+ for (Object entry : (List<?>) value){
+ newList.add(evaluateAll(entry));
+ }
+
+ return newList.build();
+ } else {
+ return value;
+ }
+ }
+}
\ No newline at end of file
Added: portal/branches/branch-GTNPORTAL-1745/gadgets/server/src/main/webapp/WEB-INF/classes/containers/default/container.js
===================================================================
--- portal/branches/branch-GTNPORTAL-1745/gadgets/server/src/main/webapp/WEB-INF/classes/containers/default/container.js (rev 0)
+++ portal/branches/branch-GTNPORTAL-1745/gadgets/server/src/main/webapp/WEB-INF/classes/containers/default/container.js 2011-01-10 11:31:22 UTC (rev 5715)
@@ -0,0 +1,180 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+// Default container configuration. To change the configuration, you have two options:
+//
+// A. If you run the Java server: Create your own "myContainer.js" file and
+// modify the value in web.xml.
+//
+// B. If you run the PHP server: Create a myContainer.js, copy the contents of container.js to it,
+// change
+// {"gadgets.container" : ["default"],
+// to
+// {"gadgets.container" : ["myContainer"],
+// And make your changes that you need to myContainer.js.
+// Just make sure on the iframe URL you specify &container=myContainer
+// for it to use that config.
+//
+// All configurations will automatically inherit values from this
+// config, so you only need to provide configuration for items
+// that you require explicit special casing for.
+//
+// Please namespace your attributes using the same conventions
+// as you would for javascript objects, e.g. gadgets.features
+// rather than "features".
+
+// NOTE: Please _don't_ leave trailing commas because the php json parser
+// errors out on this.
+
+// Container must be an array; this allows multiple containers
+// to share configuration.
+{"gadgets.container" : ["default"],
+
+// Set of regular expressions to validate the parent parameter. This is
+// necessary to support situations where you want a single container to support
+// multiple possible host names (such as for localized domains, such as
+// <language>.example.org. If left as null, the parent parameter will be
+// ignored; otherwise, any requests that do not include a parent
+// value matching this set will return a 404 error.
+"gadgets.parent" : null,
+
+// Should all gadgets be forced on to a locked domain?
+"gadgets.lockedDomainRequired" : false,
+
+// DNS domain on which gadgets should render.
+"gadgets.lockedDomainSuffix" : "-a.example.com:8080",
+
+// Various urls generated throughout the code base.
+// iframeBaseUri will automatically have the host inserted
+// if locked domain is enabled and the implementation supports it.
+// query parameters will be added.
+"gadgets.iframeBaseUri" : "/eXoGadgetServer/gadgets/ifr",
+
+// jsUriTemplate will have %host% and %js% substituted.
+// No locked domain special cases, but jsUriTemplate must
+// never conflict with a lockedDomainSuffix.
+"gadgets.jsUriTemplate" : "http://%host%/eXoGadgetServer/gadgets/js/%js%",
+
+// Callback URL. Scheme relative URL for easy switch between https/http.
+"gadgets.oauthGadgetCallbackTemplate" : "//%host%/eXoGadgetServer/gadgets/oauthcallback",
+
+// Use an insecure security token by default
+"gadgets.securityTokenType" : "secure",
+"gadgets.securityTokenKeyFile" : "key.txt",
+
+"gadgets.signingKeyFile" : "oauthkey.pem",
+"gadgets.signingKeyName" : "mytestkey",
+
+"gadgets.signedFetchDomain" : "eXo",
+// Config param to load Opensocial data for social
+// preloads in data pipelining. %host% will be
+// substituted with the current host.
+"gadgets.osDataUri" : "http://%host%/social/rpc",
+
+// Uncomment these to switch to a secure version
+//
+//"gadgets.securityTokenType" : "secure",
+//"gadgets.securityTokenKeyFile" : "/path/to/key/file.txt",
+
+"gadgets.content-rewrite" : {
+ "include-urls": ".*",
+ "exclude-urls": "",
+ "include-tags": ["link", "script", "embed", "img", "style"],
+ "expires": "86400",
+ "proxy-url": "/eXoGadgetServer/gadgets/proxy?url=",
+ "concat-url": "/eXoGadgetServer/gadgets/concat?"
+},
+
+// This config data will be passed down to javascript. Please
+// configure your object using the feature name rather than
+// the javascript name.
+
+// Only configuration for required features will be used.
+// See individual feature.xml files for configuration details.
+"gadgets.features" : {
+ "core.io" : {
+ // Note: /proxy is an open proxy. Be careful how you expose this!
+ "proxyUrl" : "http://%host%/eXoGadgetServer/gadgets/proxy?refresh=%refresh%&url=%url%",
+ "jsonProxyUrl" : "http://%host%/eXoGadgetServer/gadgets/makeRequest"
+ },
+ "views" : {
+ "home" : {
+ "isOnlyVisible" : false,
+ "urlTemplate" : "http://%host%/eXoGadgetServer/gadgets/home?{var}",
+ "aliases": ["DASHBOARD", "default"]
+ },
+ "canvas" : {
+ "isOnlyVisible" : true,
+ "urlTemplate" : "http://%host%/eXoGadgetServer/gadgets/canvas?{var}",
+ "aliases" : ["FULL_PAGE"]
+ }
+ },
+ "rpc" : {
+ // Path to the relay file. Automatically appended to the parent
+ /// parameter if it passes input validation and is not null.
+ // This should never be on the same host in a production environment!
+ // Only use this for TESTING!
+ "parentRelayUrl" : "/eXoGadgetServer/gadgets/files/container/rpc_relay.html",
+
+ // If true, this will use the legacy ifpc wire format when making rpc
+ // requests.
+ "useLegacyProtocol" : false
+ },
+ // Skin defaults
+ "skins" : {
+ "properties" : {
+ "BG_COLOR": "",
+ "BG_IMAGE": "",
+ "BG_POSITION": "",
+ "BG_REPEAT": "",
+ "FONT_COLOR": "",
+ "ANCHOR_COLOR": ""
+ }
+ },
+ "opensocial-0.8" : {
+ // Path to fetch opensocial data from
+ // Must be on the same domain as the gadget rendering server
+ "path" : "http://%host%/social",
+ "domain" : "shindig",
+ "enableCaja" : false,
+ "supportedFields" : {
+ "person" : ["id", {"name" : ["familyName", "givenName", "unstructured"]}, "thumbnailUrl", "profileUrl"],
+ "activity" : ["id", "title"]
+ }
+ },
+ "osapi.services" : {
+ // Specifying a binding to "container.listMethods" instructs osapi to dynamicaly introspect the services
+ // provided by the container and delay the gadget onLoad handler until that introspection is
+ // complete.
+ // Alternatively a container can directly configure services here rather than having them
+ // introspected. Simply list out the available servies and omit "container.listMethods" to
+ // avoid the initialization delay caused by gadgets.rpc
+ // E.g. "gadgets.rpc" : ["activities.requestCreate", "messages.requestSend", "requestShareApp", "requestPermission"]
+ "gadgets.rpc" : ["container.listMethods"]
+ },
+// "osapi" : {
+// // The endpoints to query for available JSONRPC/REST services
+// "endPoints" : [ "http://%host%/social/rpc", "http://%host%/gadgets/api/rpc" ]
+// },
+ "osml": {
+ // OSML library resource. Can be set to null or the empty string to disable OSML
+ // for a container.
+ "library": ""
+ }
+}}
15 years, 3 months
gatein SVN: r5714 - exo/portal/branches/3.1.x/webui/portal/src/main/java/org/exoplatform/portal/application.
by do-not-reply@jboss.org
Author: ndkhoiits
Date: 2011-01-10 06:20:24 -0500 (Mon, 10 Jan 2011)
New Revision: 5714
Modified:
exo/portal/branches/3.1.x/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java
Log:
EXOGTN-215 The header is duplicated when portlet add more 1 resource to header
Modified: exo/portal/branches/3.1.x/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java
===================================================================
--- exo/portal/branches/3.1.x/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java 2011-01-10 07:00:50 UTC (rev 5713)
+++ exo/portal/branches/3.1.x/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java 2011-01-10 11:20:24 UTC (rev 5714)
@@ -423,9 +423,9 @@
List<String> markupHeaders = new ArrayList<String>();
if (extraMarkupHeaders != null && !extraMarkupHeaders.isEmpty())
{
- StringWriter sw = new StringWriter();
for (Element element : extraMarkupHeaders)
{
+ StringWriter sw = new StringWriter();
DOMSerializer.serialize(element, sw);
markupHeaders.add(sw.toString());
}
15 years, 3 months
gatein SVN: r5713 - portal/branches/branch-GTNPORTAL-1745/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation.
by do-not-reply@jboss.org
Author: phuong_vu
Date: 2011-01-10 02:00:50 -0500 (Mon, 10 Jan 2011)
New Revision: 5713
Modified:
portal/branches/branch-GTNPORTAL-1745/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java
Log:
GTNPORTAL-1739 Problem when change language in Navigation
Modified: portal/branches/branch-GTNPORTAL-1745/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1745/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java 2011-01-10 06:59:23 UTC (rev 5712)
+++ portal/branches/branch-GTNPORTAL-1745/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java 2011-01-10 07:00:50 UTC (rev 5713)
@@ -150,8 +150,9 @@
*/
public void initTreeData() throws Exception
{
- WebuiRequestContext requestContext = WebuiRequestContext.getCurrentInstance();
- localizeNavigation(requestContext.getLocale());
+// Move this to processRender method because of GTNPORTAL-1739
+// WebuiRequestContext requestContext = WebuiRequestContext.getCurrentInstance();
+// localizeNavigation(requestContext.getLocale());
initEdittedTreeNodeData();
}
@@ -294,6 +295,8 @@
public void processRender(WebuiRequestContext context) throws Exception
{
+ localizeNavigation(context.getLocale());
+
UIRightClickPopupMenu uiPopupMenu = getChild(UIRightClickPopupMenu.class);
if (uiPopupMenu != null)
{
15 years, 3 months
gatein SVN: r5712 - exo/portal/branches/3.1.x/docs/reference-guide/en/modules/PortalDevelopment.
by do-not-reply@jboss.org
Author: trong.tran
Date: 2011-01-10 01:59:23 -0500 (Mon, 10 Jan 2011)
New Revision: 5712
Modified:
exo/portal/branches/3.1.x/docs/reference-guide/en/modules/PortalDevelopment/JavascriptConfiguration.xml
Log:
DOC-482 wrong documentation about Javascript configuration in GateIn
Modified: exo/portal/branches/3.1.x/docs/reference-guide/en/modules/PortalDevelopment/JavascriptConfiguration.xml
===================================================================
--- exo/portal/branches/3.1.x/docs/reference-guide/en/modules/PortalDevelopment/JavascriptConfiguration.xml 2011-01-07 15:27:11 UTC (rev 5711)
+++ exo/portal/branches/3.1.x/docs/reference-guide/en/modules/PortalDevelopment/JavascriptConfiguration.xml 2011-01-10 06:59:23 UTC (rev 5712)
@@ -1,109 +1,100 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- This document was created with Syntext Serna Free. --><!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY % BOOK_ENTITIES SYSTEM "../../Reference_Guide.ent">
%BOOK_ENTITIES;
]>
<section id="sect-Reference_Guide-Javascript_Configuration">
- <title>Javascript Configuration</title>
- <para>
- Managing Javascript scripts in an application like &PRODUCT; is a critical part of the configuration work.
+ <title>JavaScript Configuration</title>
+ <para>
+ Managing JavaScript in an application like &PRODUCT; is a critical part of the configuration work.
Configuring the scripts correctly will result in a faster response time from the portal.
- </para>
- <para>
- Every portlet can have its own javscript code but in many cases it is more convenient to reuse some existing
+ </para>
+ <para>
+ Every portlet can have its own JavaScript code but in many cases, it is more convenient to reuse some existing
shared libraries. For that reason, &PRODUCT; has a mechanism to easily register the libraries that will be loaded
- when the first page will be rendered.
- </para>
- <para>
- To do so, every WAR deployed in &PRODUCT; can register the <filename>.js</filename> files with the groovy script
- <filename>WEB-INF/conf/script/groovy/JavascriptScript.groovy</filename>. (TODO: this file doesn't seem to exist)
- </para>
- <para>
- The example file below is found in the 01eXoResources.war
- </para>
-
-<programlisting role="JAVA">JavascriptService.addJavascript("eXo", "/javascript/eXo.js", ServletContext);
-/* Animation Javascripts */
-JavascriptService.addJavascript("eXo.animation.ImplodeExplode", "/javascript/eXo/animation/ImplodeExplode.js", ServletContext);
-/* Application descriptor */
-JavascriptService.addJavascript("eXo.application.ApplicationDescriptor", "/javascript/eXo/application/ApplicationDescriptor.js", ServletContext);
-/* CORE Javascripts */
-JavascriptService.addJavascript("eXo.core.Utils", "/javascript/eXo/core/Util.js", ServletContext);
-JavascriptService.addJavascript("eXo.core.DOMUtil", "/javascript/eXo/core/DOMUtil.js", ServletContext);
-JavascriptService.addJavascript("eXo.core.Browser", "/javascript/eXo/core/Browser.js", ServletContext);
-JavascriptService.addJavascript("eXo.core.MouseEventManager", "/javascript/eXo/core/MouseEventManager.js", ServletContext);
-JavascriptService.addJavascript("eXo.core.UIMaskLayer", "/javascript/eXo/core/UIMaskLayer.js", ServletContext);
-JavascriptService.addJavascript("eXo.core.Skin", "/javascript/eXo/core/Skin.js", ServletContext);
-JavascriptService.addJavascript("eXo.core.DragDrop", "/javascript/eXo/core/DragDrop.js", ServletContext);
-JavascriptService.addJavascript("eXo.core.TemplateEngine", "/javascript/eXo/core/TemplateEngine.js", ServletContext);
-/* Widget Javascripts */
-JavascriptService.addJavascript("eXo.widget.UIWidget", "/javascript/eXo/widget/UIWidget.js", ServletContext);
-JavascriptService.addJavascript("eXo.widget.UIAddWidget", "/javascript/eXo/widget/UIAddWidget.js", ServletContext);
-JavascriptService.addJavascript("eXo.widget.UIExoWidget", "/javascript/eXo/widget/UIExoWidget.js", ServletContext);
-/* Desktop Javascripts */
-JavascriptService.addJavascript("eXo.desktop.UIDockbar", "/javascript/eXo/desktop/UIDockbar.js", ServletContext);
-JavascriptService.addJavascript("eXo.desktop.UIDesktop", "/javascript/eXo/desktop/UIDesktop.js", ServletContext);
-/* WebUI Javascripts */
-JavascriptService.addJavascript("eXo.webui.UIItemSelector", "/javascript/eXo/webui/UIItemSelector.js", ServletContext);
-JavascriptService.addJavascript("eXo.webui.UIForm", "/javascript/eXo/webui/UIForm.js", ServletContext);
-JavascriptService.addJavascript("eXo.webui.UIPopup", "/javascript/eXo/webui/UIPopup.js", ServletContext);
-JavascriptService.addJavascript("eXo.webui.UIPopupSelectCategory", "/javascript/eXo/webui/UIPopupSelectCategory.js", ServletContext);
-JavascriptService.addJavascript("eXo.webui.UIPopupWindow", "/javascript/eXo/webui/UIPopupWindow.js", ServletContext);
-JavascriptService.addJavascript("eXo.webui.UIVerticalScroller", "/javascript/eXo/webui/UIVerticalScroller.js", ServletContext);
-JavascriptService.addJavascript("eXo.webui.UIHorizontalTabs", "/javascript/eXo/webui/UIHorizontalTabs.js", ServletContext);
-JavascriptService.addJavascript("eXo.webui.UIPopupMenu", "/javascript/eXo/webui/UIPopupMenu.js", ServletContext);
-JavascriptService.addJavascript("eXo.webui.UIDropDownControl", "/javascript/eXo/webui/UIDropDownControl.js", ServletContext);
-/* Portal Javascripts */
-JavascriptService.addJavascript("eXo.portal.PortalHttpRequest", "/javascript/eXo/portal/PortalHttpRequest.js", ServletContext);
-JavascriptService.addJavascript("eXo.portal.UIPortal", "/javascript/eXo/portal/UIPortal.js", ServletContext);
-JavascriptService.addJavascript("eXo.portal.UIWorkspace", "/javascript/eXo/portal/UIWorkspace.js", ServletContext);
-JavascriptService.addJavascript("eXo.portal.UIPortalControl", "/javascript/eXo/portal/UIPortalControl.js", ServletContext);
-JavascriptService.addJavascript("eXo.portal.PortalDragDrop", "/javascript/eXo/portal/PortalDragDrop.js", ServletContext);
-JavascriptService.addJavascript("eXo.portal.UIPortalNavigation", "/javascript/eXo/portal/UIPortalNavigation.js", ServletContext);
-JavascriptService.addJavascript("eXo.portal.UIMaskWorkspace", "/javascript/eXo/portal/UIMaskWorkspace.js", ServletContext);
-JavascriptService.addJavascript("eXo.portal.UIExoStartMenu", "/javascript/eXo/portal/UIExoStartMenu.js", ServletContext);
-/* Desktop Javascripts 2 */
-JavascriptService.addJavascript("eXo.desktop.UIWindow", "/javascript/eXo/desktop/UIWindow.js", ServletContext);
+ when every page is rendered.
+ </para>
+ <para>
+ To do so, every WAR deployed in &PRODUCT; can register the <filename>.js</filename> files with the <emphasis role="bold">gatein-resources.xml</emphasis> configuration file.</para>
+ <para>
+ The example code snippet below is found in the <emphasis role="bold">gatein-resources.xml</emphasis> in the <emphasis role="bold">eXoResources.war </emphasis>file.</para>
+ <programlisting role="XML"><javascript>
+ <param>
+ <js-module>eXo</js-module>
+ <js-path>/javascript/eXo.js</js-path>
+ <js-priority>0</js-priority>
+ </param>
+</javascript>
+
+<!-- CORE Javascripts -->
+<javascript>
+ <param>
+ <js-module>eXo.core.Utils</js-module>
+ <js-path>/javascript/eXo/core/Util.js</js-path>
+ <js-priority>1</js-priority>
+ </param>
+ <param>
+ <js-module>eXo.core.DOMUtil</js-module>
+ <js-path>/javascript/eXo/core/DOMUtil.js</js-path>
+ <js-priority>1</js-priority>
+ </param>
+ <param>
+ <js-module>eXo.core.Browser</js-module>
+ <js-path>/javascript/eXo/core/Browser.js</js-path>
+ <js-priority>2</js-priority>
+ </param>
+ <param>
+ <js-module>eXo.core.MouseEventManager</js-module>
+ <js-path>/javascript/eXo/core/MouseEventManager.js</js-path>
+ </param>
+ <param>
+ <js-module>eXo.core.UIMaskLayer</js-module>
+ <js-path>/javascript/eXo/core/UIMaskLayer.js</js-path>
+ </param>
+ <param>
+ <js-module>eXo.core.Skin</js-module>
+ <js-path>/javascript/eXo/core/Skin.js</js-path>
+ </param>
+ <param>
+ <js-module>eXo.core.DragDrop</js-module>
+ <js-path>/javascript/eXo/core/DragDrop.js</js-path>
+ </param>
+ <param>
+ <js-module>eXo.core.DragDrop2</js-module>
+ <js-path>/javascript/eXo/core/DragDrop2.js</js-path>
+ </param>
+</javascript>
</programlisting>
- <para>
- Note that even registered dedicated javascripts will be merged into a single <literal>merged.js</literal> file when the server loads. This reduces the number of HTTP calls as seen in the home page source code:
- </para>
-
-<programlisting role="XML"><script type="text/javascript" src="/portal/javascript/merged.js"></script>
+ <para>
+ Note that registered JavaScript files will be merged into a single <literal>merged.js</literal> file when the server loads. This reduces the number of HTTP calls as seen in the home page source code:
+ </para>
+ <programlisting role="XML"><script type="text/javascript" src="/portal/javascript/merged.js"></script>
</programlisting>
- <para>
- Although this optimization is useful for a production environment, it may be easier to deactivate this optimization while debugging javascript problems.
- </para>
- <para>
- To do this, set the java system property <literal>exo.product.developing</literal> to <literal>true</literal>.
- </para>
- <para>
- To see or use the merged file set this property to <literal>false</literal>.
- </para>
- <para>
- The property can be passed as a JVM parameter with the <literal>-D</literal> option in your <literal>GateIn.sh</literal> or <literal>GateIn.bat</literal> startup script.
- </para>
- <para>
- Every javascript file is associated with a module name which acts as a namespace.
+ <para>
+ Although this optimization is useful for a production environment, it may be easier to deactivate this optimization while debugging JavaScript problems.
+ </para>
+ <para>
+ To do this, set the java system property <literal>exo.product.developing</literal> to <literal>true</literal>.
+ GateIn provides two startup scripts that define this property in gatein-dev.sh (for Linux, Mac) and gatein-dev.bat (for Windows).</para>
+ <para>
+ To generate the <literal>merged.js</literal> file, set this property to <literal>false</literal>.
+ If the property is not set, the default value is false. </para>
+ <para>
+ The property can be passed as a JVM parameter with the <literal>-D</literal> option in your <literal>GateIn.sh</literal> or <literal>GateIn.bat</literal> startup script.
+ </para>
+ <para>
+ Every JavaScript file is associated with a module name which acts as a namespace.
- The module name is passed as a first parameter to JavascriptService.addJavascript() function as in the following example:
- </para>
- <programlisting role="JAVA">
-JavascriptService.addJavascript("eXo.core.DragDrop",
- "/javascript/eXo/core/DragDrop.js", ServletContext);
- </programlisting>
- <para>
- Inside the associated javascript files, functions are exposed as global javascript function variables using the module name.
- </para>
- <para> For example:</para>
- <programlisting role="JAVA">
+ </para>
+ <para>
+ Inside the associated JavaScript files, the eXo JavaScript objects are exposed as global variables named after the module.</para>
+ <para> For example:</para>
+ <programlisting role="JAVA">
eXo.core.DragDrop = new DragDrop();
</programlisting>
- <para>
- It is also possible to use <literal>eXo.require()</literal> javascript method to lazy load and evaluate some javascript code.
- This is quite useful for the portlet or widget applications that will use this javascript only once. Otherwise,
- if the library is reusable in several places it is better to reference it in the groovy file.
- </para>
+ <para>
+ It is also possible to use the <literal>eXo.require()</literal>method to lazy load and evaluate some JavaScript code.
+ This is quite useful for the portlet or gadget applications that will use this JavaScript only once. Otherwise,
+ if the library is reusable in several places, it is better to define it in the <emphasis role="bold">gatein-resources.xml</emphasis> file.
+ </para>
</section>
-
-
15 years, 3 months
gatein SVN: r5711 - in components/pc/trunk/test/servers: tomcat6 and 1 other directories.
by do-not-reply@jboss.org
Author: julien_viet
Date: 2011-01-07 10:27:11 -0500 (Fri, 07 Jan 2011)
New Revision: 5711
Added:
components/pc/trunk/test/servers/src/common/resources/common2.xml
Removed:
components/pc/trunk/test/servers/tomcat6/src/test/common.xml
Modified:
components/pc/trunk/test/servers/tomcat6/pom.xml
Log:
move new common to common2
Copied: components/pc/trunk/test/servers/src/common/resources/common2.xml (from rev 5710, components/pc/trunk/test/servers/tomcat6/src/test/common.xml)
===================================================================
--- components/pc/trunk/test/servers/src/common/resources/common2.xml (rev 0)
+++ components/pc/trunk/test/servers/src/common/resources/common2.xml 2011-01-07 15:27:11 UTC (rev 5711)
@@ -0,0 +1,281 @@
+<?xml version="1.0"?>
+<project name="portlet-integration-test" xmlns:artifact="antlib:org.apache.maven.artifact.ant">
+
+ <path id="maven-ant-tasks.classpath" path="${maven.dependency.org.apache.maven.maven-ant-tasks.jar.path}"/>
+ <typedef resource="org/apache/maven/artifact/ant/antlib.xml"
+ uri="antlib:org.apache.maven.artifact.ant"
+ classpathref="maven-ant-tasks.classpath" />
+
+ <property name="target.dir" value="${basedir}/target"/>
+ <property name="test.dir" value="${target.dir}/integration-tests"/>
+ <property name="test.cargo.dir" value="${test.dir}/cargo/"/>
+
+ <target name="tests.common" depends="prepare_env" >
+
+ <echo message="compile classpath: ${compile_classpath}"/>
+ <echo message="runtime classpath: ${runtime_classpath}"/>
+ <echo message="test classpath: ${test_classpath}"/>
+ <echo message="plugin classpath: ${plugin_classpath}"/>
+ <echo message="base directory: ${basedir}"/>
+
+ <echo message="You can run small subset of tests using -Pjboss42, -Pjboss51, -Ptomcat6, -Ptomcat7"/>
+
+ <antcall target="package-tests"/>
+
+ <antcall target="test.container-servlet"/>
+
+ </target>
+
+ <target name="prepare_env">
+
+ <!--Relative path to target dir-->
+ <property name="target" value="${basedir}/target"/>
+ <property name="test.temp.dir" value="${target}/integration-tests/test-apps"/>
+ <property name="test.temp.portlet" value="${test.temp.dir}/portlet-test"/>
+ <property name="test.temp.lib" value="${test.temp.dir}/lib"/>
+
+ <mkdir dir="${test.temp.dir}"/>
+ <mkdir dir="${test.temp.lib}"/>
+ <mkdir dir="${target}/jboss-unit"/>
+
+ <echo message="Preparing environment"/>
+
+ <path id="jboss-logging">
+ <pathelement location="${jboss:jboss-common-logging-spi:jar}"/>
+ <pathelement location="${jboss:jboss-common-logging-jdk:jar}"/>
+ <pathelement location="${jboss:jboss-common-logging-log4j:jar}"/>
+ </path>
+
+ <path id="jboss-xb">
+ <pathelement location="${org.jboss:jbossxb:jar}"/>
+ </path>
+
+ <path id="portal-common">
+ </path>
+
+ <path id="portal-common-shared">
+ <pathelement location="${org.gatein.common:common-common:jar}"/>
+ <pathelement location="${org.gatein.common:common-logging:jar}"/>
+ <pathelement location="${org.slf4j:slf4j-simple:jar}"/>
+ <pathelement location="${org.slf4j:slf4j-api:jar}"/>
+ </path>
+
+ <path id="portal-web">
+ </path>
+
+ <path id="portal-web-shared">
+ <pathelement location="${org.gatein.wci:wci-wci:jar}"/>
+ </path>
+
+ <path id="portal-portlet">
+ <pathelement location="${org.gatein.pc:pc-controller:jar}"/>
+ <pathelement location="${org.gatein.pc:pc-mc:jar}"/>
+ </path>
+
+ <path id="portal-portlet-shared">
+ <pathelement location="${org.gatein.pc:pc-portlet:jar}"/>
+ <pathelement location="${org.gatein.pc:pc-api:jar}"/>
+ <pathelement location="${javax.portlet:portlet-api:jar}"/>
+ </path>
+
+ <path id="jboss-unit">
+ </path>
+
+ <path id="jboss-unit-shared">
+ <pathelement location="${org.jboss.unit:jboss-unit:jar}"/>
+ <pathelement location="${org.jboss.unit:jboss-unit-remote:jar}"/>
+ <pathelement location="${org.jboss.unit:portal-test-generic:jar}"/>
+ <pathelement location="${org.jboss.unit:portal-test:jar}"/>
+ <pathelement location="${org.jboss.remoting:jboss-remoting:jar}"/>
+ </path>
+
+ </target>
+
+ <macrodef name="package-ext-test">
+ <attribute name="test"/>
+ <sequential>
+ <package-testsuite testsuiteversion="jsr168" testsuitetype="ext" testsuitename="@{test}"/>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="package-tck-test">
+ <attribute name="test"/>
+ <sequential>
+ <package-testsuite testsuiteversion="jsr168" testsuitetype="tck" testsuitename="@{test}"/>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="package-api-test">
+ <attribute name="test"/>
+ <sequential>
+ <package-testsuite testsuiteversion="jsr168" testsuitetype="api" testsuitename="@{test}"/>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="package-jsr286-tck-test">
+ <attribute name="test"/>
+ <sequential>
+ <package-testsuite testsuiteversion="jsr286" testsuitetype="tck" testsuitename="@{test}"/>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="package-jsr286-api-test">
+ <attribute name="test"/>
+ <sequential>
+ <package-testsuite testsuiteversion="jsr286" testsuitetype="api" testsuitename="@{test}"/>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="package-jsr286-ext-test">
+ <attribute name="test"/>
+ <sequential>
+ <package-testsuite testsuiteversion="jsr286" testsuitetype="ext" testsuitename="@{test}"/>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="package-testsuite">
+ <attribute name="testsuiteversion"/>
+ <attribute name="testsuitetype"/>
+ <attribute name="testsuitename"/>
+ <sequential>
+
+ <artifact:dependencies pathId="dependency.classpath">
+ <dependency
+ groupId="org.gatein.pc"
+ artifactId="pc-test-core-@{testsuiteversion}-@{testsuitetype}-@{testsuitename}"
+ version="${project.version}"
+ type="war"/>
+ </artifact:dependencies>
+
+ <copy tofile="${test.temp.lib}/test-@{testsuiteversion}-@{testsuitetype}-(a){testsuitename}.war">
+ <path refid="dependency.classpath"/>
+ </copy>
+
+ </sequential>
+ </macrodef>
+
+ <target name="package-tests">
+
+ <package-tck-test test="portletinterface"/>
+ <package-tck-test test="dispatcher"/>
+ <package-tck-test test="portletrequests"/>
+ <package-tck-test test="portletmode"/>
+ <package-tck-test test="portletconfig"/>
+ <package-tck-test test="portletresponses"/>
+ <package-tck-test test="preferences"/>
+ <package-tck-test test="portletsession"/>
+ <package-tck-test test="portleturl"/>
+ <package-tck-test test="windowstates"/>
+ <package-tck-test test="portletcontext"/>
+ <package-api-test test="portletconfig"/>
+ <package-api-test test="portletmode"/>
+ <package-api-test test="windowstate"/>
+ <package-api-test test="portletsessionutil"/>
+ <package-api-test test="portalcontext"/>
+ <package-api-test test="portletcontext"/>
+ <package-api-test test="portleturl"/>
+ <package-api-test test="portletpreferences"/>
+ <package-api-test test="portletsession"/>
+ <package-api-test test="actionrequest"/>
+ <package-api-test test="renderrequest"/>
+ <package-api-test test="actionresponse"/>
+ <package-api-test test="renderresponse"/>
+ <package-ext-test test="nocache"/>
+ <package-ext-test test="expiringcache"/>
+ <package-ext-test test="neverexpiringcache"/>
+ <package-ext-test test="preferences"/>
+ <package-ext-test test="session"/>
+ <package-ext-test test="portletresponses"/>
+ <package-ext-test test="portletrequests"/>
+ <package-ext-test test="portletmode"/>
+ <package-ext-test test="portletconfig"/>
+ <package-ext-test test="taglib"/>
+ <package-jsr286-tck-test test="dispatcher"/>
+ <package-jsr286-tck-test test="portletconfig"/>
+ <package-jsr286-tck-test test="portletconfignonamespace"/>
+ <package-jsr286-tck-test test="event"/>
+ <package-jsr286-tck-test test="eventnonamespace"/>
+ <package-jsr286-tck-test test="stateawareresponse"/>
+ <package-jsr286-tck-test test="portletrequests"/>
+ <package-jsr286-tck-test test="resourceserving"/>
+ <package-jsr286-tck-test test="portleturl"/>
+ <package-jsr286-tck-test test="portletfilter"/>
+ <package-jsr286-tck-test test="taglib"/>
+ <package-jsr286-tck-test test="userinformation"/>
+ <package-jsr286-api-test test="event"/>
+ <package-jsr286-api-test test="portleturl"/>
+ <package-jsr286-ext-test test="portletrequests"/>
+ <package-jsr286-ext-test test="portletfilter"/>
+ <package-jsr286-ext-test test="portletresponses"/>
+ <package-jsr286-ext-test test="dispatcher"/>
+ <package-jsr286-ext-test test="portletcontext"/>
+ <package-jsr286-ext-test test="portletinterface"/>
+ <package-jsr286-ext-test test="event"/>
+ <package-jsr286-ext-test test="eventsupport"/>
+ <package-jsr286-ext-test test="portletmode"/>
+
+ <!-- -->
+ <copy todir="${target}/test-classes/portlet-test-war/WEB-INF/lib" flatten="true">
+ <path refid="${test.server.name}-${test.server.version}"/>
+ <path>
+ <pathelement location="${org.gatein.pc:pc-test-core:jar}"/>
+ <pathelement location="${org.gatein.pc:pc-test-core:test-jar:tests}"/>
+ </path>
+ </copy>
+ <mkdir dir="${test.temp.lib}/${test.server.name}-${test.server.version}"/>
+ <war
+ destfile="${test.temp.lib}/${test.server.name}-${test.server.version}/portlet-test.war"
+ needxmlfile="false">
+ <fileset dir="${target}/test-classes/portlet-test-war"/>
+ </war>
+
+ </target>
+
+ <target name="cargo.setup">
+ <property name="cargo.log.dir" value="${target}/integration-tests/cargo-logs"/>
+ <mkdir dir="${cargo.log.dir}"/>
+ <taskdef resource="cargo.tasks">
+ <classpath>
+ <pathelement path="${plugin_classpath}"/>
+ </classpath>
+ </taskdef>
+ </target>
+
+ <target name="test.container-servlet">
+ <echo message="Starting ${test.server.name} ${test.server.version} with ${test.remote.server.name} to execute ${test.server.name} tests"/>
+ <antcall target="cargo.start">
+ <param name="cargo.wait" value="false"/>
+ </antcall>
+ <antcall target="tests.remote">
+ <param name="test.server.name" value="${test.remote.server.name}"/>
+ </antcall>
+ <antcall target="cargo.stop"/>
+ </target>
+
+ <target name="tests.remote">
+
+ <taskdef name="jboss-unit" classname="org.jboss.unit.tooling.ant.JBossUnitTask" classpath="${plugin_classpath}"/>
+
+ <jboss-unit jpda="false" jpdaPort="9000" jpdaSuspend="true" failOnError="true">
+
+ <tests config="${target}/test-classes/test/remote-jboss-unit.xml">
+ <property name="archivePath" value="${test.temp.lib}"/>
+ <property name="serverName" value="${test.server.name}"/>
+ </tests>
+
+ <reports>
+ <xml toDir="${target}/tests/reports/xml/${test.server.name}"/>
+ <html toDir="${target}/tests/reports/html/${test.server.name}"/>
+ </reports>
+
+ <classpath>
+ <pathelement location="${test.temp.lib}"/>
+ <pathelement location="${target}/test-classes/test"/>
+ <pathelement path="${test_classpath}"/>
+ </classpath>
+
+ </jboss-unit>
+
+ </target>
+
+</project>
Modified: components/pc/trunk/test/servers/tomcat6/pom.xml
===================================================================
--- components/pc/trunk/test/servers/tomcat6/pom.xml 2011-01-07 15:17:53 UTC (rev 5710)
+++ components/pc/trunk/test/servers/tomcat6/pom.xml 2011-01-07 15:27:11 UTC (rev 5711)
@@ -356,8 +356,8 @@
</condition>
<!-- location of common.xml shared between the different server's build.xml -->
- <!--<property name="common.xml.file" value="${test.common.xml}"/>-->
- <property name="common.xml.file" value="${basedir}/src/test/common.xml"/>
+ <!-- for now hardcode like that, it should be probably moved to the test-core package -->
+ <property name="common.xml.file" value="${project.basedir}/../src/common/resources/common2.xml"/>
<ant antfile="${basedir}/src/test/build.xml" inheritRefs="true">
<target name="tests"/>
Deleted: components/pc/trunk/test/servers/tomcat6/src/test/common.xml
===================================================================
--- components/pc/trunk/test/servers/tomcat6/src/test/common.xml 2011-01-07 15:17:53 UTC (rev 5710)
+++ components/pc/trunk/test/servers/tomcat6/src/test/common.xml 2011-01-07 15:27:11 UTC (rev 5711)
@@ -1,281 +0,0 @@
-<?xml version="1.0"?>
-<project name="portlet-integration-test" xmlns:artifact="antlib:org.apache.maven.artifact.ant">
-
- <path id="maven-ant-tasks.classpath" path="${maven.dependency.org.apache.maven.maven-ant-tasks.jar.path}"/>
- <typedef resource="org/apache/maven/artifact/ant/antlib.xml"
- uri="antlib:org.apache.maven.artifact.ant"
- classpathref="maven-ant-tasks.classpath" />
-
- <property name="target.dir" value="${basedir}/target"/>
- <property name="test.dir" value="${target.dir}/integration-tests"/>
- <property name="test.cargo.dir" value="${test.dir}/cargo/"/>
-
- <target name="tests.common" depends="prepare_env" >
-
- <echo message="compile classpath: ${compile_classpath}"/>
- <echo message="runtime classpath: ${runtime_classpath}"/>
- <echo message="test classpath: ${test_classpath}"/>
- <echo message="plugin classpath: ${plugin_classpath}"/>
- <echo message="base directory: ${basedir}"/>
-
- <echo message="You can run small subset of tests using -Pjboss42, -Pjboss51, -Ptomcat6, -Ptomcat7"/>
-
- <antcall target="package-tests"/>
-
- <antcall target="test.container-servlet"/>
-
- </target>
-
- <target name="prepare_env">
-
- <!--Relative path to target dir-->
- <property name="target" value="${basedir}/target"/>
- <property name="test.temp.dir" value="${target}/integration-tests/test-apps"/>
- <property name="test.temp.portlet" value="${test.temp.dir}/portlet-test"/>
- <property name="test.temp.lib" value="${test.temp.dir}/lib"/>
-
- <mkdir dir="${test.temp.dir}"/>
- <mkdir dir="${test.temp.lib}"/>
- <mkdir dir="${target}/jboss-unit"/>
-
- <echo message="Preparing environment"/>
-
- <path id="jboss-logging">
- <pathelement location="${jboss:jboss-common-logging-spi:jar}"/>
- <pathelement location="${jboss:jboss-common-logging-jdk:jar}"/>
- <pathelement location="${jboss:jboss-common-logging-log4j:jar}"/>
- </path>
-
- <path id="jboss-xb">
- <pathelement location="${org.jboss:jbossxb:jar}"/>
- </path>
-
- <path id="portal-common">
- </path>
-
- <path id="portal-common-shared">
- <pathelement location="${org.gatein.common:common-common:jar}"/>
- <pathelement location="${org.gatein.common:common-logging:jar}"/>
- <pathelement location="${org.slf4j:slf4j-simple:jar}"/>
- <pathelement location="${org.slf4j:slf4j-api:jar}"/>
- </path>
-
- <path id="portal-web">
- </path>
-
- <path id="portal-web-shared">
- <pathelement location="${org.gatein.wci:wci-wci:jar}"/>
- </path>
-
- <path id="portal-portlet">
- <pathelement location="${org.gatein.pc:pc-controller:jar}"/>
- <pathelement location="${org.gatein.pc:pc-mc:jar}"/>
- </path>
-
- <path id="portal-portlet-shared">
- <pathelement location="${org.gatein.pc:pc-portlet:jar}"/>
- <pathelement location="${org.gatein.pc:pc-api:jar}"/>
- <pathelement location="${javax.portlet:portlet-api:jar}"/>
- </path>
-
- <path id="jboss-unit">
- </path>
-
- <path id="jboss-unit-shared">
- <pathelement location="${org.jboss.unit:jboss-unit:jar}"/>
- <pathelement location="${org.jboss.unit:jboss-unit-remote:jar}"/>
- <pathelement location="${org.jboss.unit:portal-test-generic:jar}"/>
- <pathelement location="${org.jboss.unit:portal-test:jar}"/>
- <pathelement location="${org.jboss.remoting:jboss-remoting:jar}"/>
- </path>
-
- </target>
-
- <macrodef name="package-ext-test">
- <attribute name="test"/>
- <sequential>
- <package-testsuite testsuiteversion="jsr168" testsuitetype="ext" testsuitename="@{test}"/>
- </sequential>
- </macrodef>
-
- <macrodef name="package-tck-test">
- <attribute name="test"/>
- <sequential>
- <package-testsuite testsuiteversion="jsr168" testsuitetype="tck" testsuitename="@{test}"/>
- </sequential>
- </macrodef>
-
- <macrodef name="package-api-test">
- <attribute name="test"/>
- <sequential>
- <package-testsuite testsuiteversion="jsr168" testsuitetype="api" testsuitename="@{test}"/>
- </sequential>
- </macrodef>
-
- <macrodef name="package-jsr286-tck-test">
- <attribute name="test"/>
- <sequential>
- <package-testsuite testsuiteversion="jsr286" testsuitetype="tck" testsuitename="@{test}"/>
- </sequential>
- </macrodef>
-
- <macrodef name="package-jsr286-api-test">
- <attribute name="test"/>
- <sequential>
- <package-testsuite testsuiteversion="jsr286" testsuitetype="api" testsuitename="@{test}"/>
- </sequential>
- </macrodef>
-
- <macrodef name="package-jsr286-ext-test">
- <attribute name="test"/>
- <sequential>
- <package-testsuite testsuiteversion="jsr286" testsuitetype="ext" testsuitename="@{test}"/>
- </sequential>
- </macrodef>
-
- <macrodef name="package-testsuite">
- <attribute name="testsuiteversion"/>
- <attribute name="testsuitetype"/>
- <attribute name="testsuitename"/>
- <sequential>
-
- <artifact:dependencies pathId="dependency.classpath">
- <dependency
- groupId="org.gatein.pc"
- artifactId="pc-test-core-@{testsuiteversion}-@{testsuitetype}-@{testsuitename}"
- version="${project.version}"
- type="war"/>
- </artifact:dependencies>
-
- <copy tofile="${test.temp.lib}/test-@{testsuiteversion}-@{testsuitetype}-(a){testsuitename}.war">
- <path refid="dependency.classpath"/>
- </copy>
-
- </sequential>
- </macrodef>
-
- <target name="package-tests">
-
- <package-tck-test test="portletinterface"/>
- <package-tck-test test="dispatcher"/>
- <package-tck-test test="portletrequests"/>
- <package-tck-test test="portletmode"/>
- <package-tck-test test="portletconfig"/>
- <package-tck-test test="portletresponses"/>
- <package-tck-test test="preferences"/>
- <package-tck-test test="portletsession"/>
- <package-tck-test test="portleturl"/>
- <package-tck-test test="windowstates"/>
- <package-tck-test test="portletcontext"/>
- <package-api-test test="portletconfig"/>
- <package-api-test test="portletmode"/>
- <package-api-test test="windowstate"/>
- <package-api-test test="portletsessionutil"/>
- <package-api-test test="portalcontext"/>
- <package-api-test test="portletcontext"/>
- <package-api-test test="portleturl"/>
- <package-api-test test="portletpreferences"/>
- <package-api-test test="portletsession"/>
- <package-api-test test="actionrequest"/>
- <package-api-test test="renderrequest"/>
- <package-api-test test="actionresponse"/>
- <package-api-test test="renderresponse"/>
- <package-ext-test test="nocache"/>
- <package-ext-test test="expiringcache"/>
- <package-ext-test test="neverexpiringcache"/>
- <package-ext-test test="preferences"/>
- <package-ext-test test="session"/>
- <package-ext-test test="portletresponses"/>
- <package-ext-test test="portletrequests"/>
- <package-ext-test test="portletmode"/>
- <package-ext-test test="portletconfig"/>
- <package-ext-test test="taglib"/>
- <package-jsr286-tck-test test="dispatcher"/>
- <package-jsr286-tck-test test="portletconfig"/>
- <package-jsr286-tck-test test="portletconfignonamespace"/>
- <package-jsr286-tck-test test="event"/>
- <package-jsr286-tck-test test="eventnonamespace"/>
- <package-jsr286-tck-test test="stateawareresponse"/>
- <package-jsr286-tck-test test="portletrequests"/>
- <package-jsr286-tck-test test="resourceserving"/>
- <package-jsr286-tck-test test="portleturl"/>
- <package-jsr286-tck-test test="portletfilter"/>
- <package-jsr286-tck-test test="taglib"/>
- <package-jsr286-tck-test test="userinformation"/>
- <package-jsr286-api-test test="event"/>
- <package-jsr286-api-test test="portleturl"/>
- <package-jsr286-ext-test test="portletrequests"/>
- <package-jsr286-ext-test test="portletfilter"/>
- <package-jsr286-ext-test test="portletresponses"/>
- <package-jsr286-ext-test test="dispatcher"/>
- <package-jsr286-ext-test test="portletcontext"/>
- <package-jsr286-ext-test test="portletinterface"/>
- <package-jsr286-ext-test test="event"/>
- <package-jsr286-ext-test test="eventsupport"/>
- <package-jsr286-ext-test test="portletmode"/>
-
- <!-- -->
- <copy todir="${target}/test-classes/portlet-test-war/WEB-INF/lib" flatten="true">
- <path refid="${test.server.name}-${test.server.version}"/>
- <path>
- <pathelement location="${org.gatein.pc:pc-test-core:jar}"/>
- <pathelement location="${org.gatein.pc:pc-test-core:test-jar:tests}"/>
- </path>
- </copy>
- <mkdir dir="${test.temp.lib}/${test.server.name}-${test.server.version}"/>
- <war
- destfile="${test.temp.lib}/${test.server.name}-${test.server.version}/portlet-test.war"
- needxmlfile="false">
- <fileset dir="${target}/test-classes/portlet-test-war"/>
- </war>
-
- </target>
-
- <target name="cargo.setup">
- <property name="cargo.log.dir" value="${target}/integration-tests/cargo-logs"/>
- <mkdir dir="${cargo.log.dir}"/>
- <taskdef resource="cargo.tasks">
- <classpath>
- <pathelement path="${plugin_classpath}"/>
- </classpath>
- </taskdef>
- </target>
-
- <target name="test.container-servlet">
- <echo message="Starting ${test.server.name} ${test.server.version} with ${test.remote.server.name} to execute ${test.server.name} tests"/>
- <antcall target="cargo.start">
- <param name="cargo.wait" value="false"/>
- </antcall>
- <antcall target="tests.remote">
- <param name="test.server.name" value="${test.remote.server.name}"/>
- </antcall>
- <antcall target="cargo.stop"/>
- </target>
-
- <target name="tests.remote">
-
- <taskdef name="jboss-unit" classname="org.jboss.unit.tooling.ant.JBossUnitTask" classpath="${plugin_classpath}"/>
-
- <jboss-unit jpda="false" jpdaPort="9000" jpdaSuspend="true" failOnError="true">
-
- <tests config="${target}/test-classes/test/remote-jboss-unit.xml">
- <property name="archivePath" value="${test.temp.lib}"/>
- <property name="serverName" value="${test.server.name}"/>
- </tests>
-
- <reports>
- <xml toDir="${target}/tests/reports/xml/${test.server.name}"/>
- <html toDir="${target}/tests/reports/html/${test.server.name}"/>
- </reports>
-
- <classpath>
- <pathelement location="${test.temp.lib}"/>
- <pathelement location="${target}/test-classes/test"/>
- <pathelement path="${test_classpath}"/>
- </classpath>
-
- </jboss-unit>
-
- </target>
-
-</project>
15 years, 3 months
gatein SVN: r5710 - in components/pc/trunk/test/servers/tomcat6: src/test and 1 other directory.
by do-not-reply@jboss.org
Author: julien_viet
Date: 2011-01-07 10:17:53 -0500 (Fri, 07 Jan 2011)
New Revision: 5710
Modified:
components/pc/trunk/test/servers/tomcat6/pom.xml
components/pc/trunk/test/servers/tomcat6/src/test/build.xml
components/pc/trunk/test/servers/tomcat6/src/test/common.xml
Log:
GTNPC-46:
- gatein common mc not needed anymore
- rename mc -> xb as this is what it is
Modified: components/pc/trunk/test/servers/tomcat6/pom.xml
===================================================================
--- components/pc/trunk/test/servers/tomcat6/pom.xml 2011-01-07 15:13:01 UTC (rev 5709)
+++ components/pc/trunk/test/servers/tomcat6/pom.xml 2011-01-07 15:17:53 UTC (rev 5710)
@@ -11,10 +11,6 @@
<name>GateIn - Portlet Container (test - servers - Tomcat 6)</name>
<dependencies>
- <dependency>
- <groupId>org.gatein.common</groupId>
- <artifactId>common-mc</artifactId>
- </dependency>
<dependency>
<groupId>org.gatein.common</groupId>
Modified: components/pc/trunk/test/servers/tomcat6/src/test/build.xml
===================================================================
--- components/pc/trunk/test/servers/tomcat6/src/test/build.xml 2011-01-07 15:13:01 UTC (rev 5709)
+++ components/pc/trunk/test/servers/tomcat6/src/test/build.xml 2011-01-07 15:17:53 UTC (rev 5710)
@@ -19,7 +19,7 @@
<path refid="portal-web"/>
<path refid="portal-portlet"/>
<path refid="jboss-unit"/>
- <path refid="jboss-microcontainer"/>
+ <path refid="jboss-xb"/>
<pathelement location="${apache-xerces:xerces:jar}"/>
<pathelement location="${apache-xerces:xml-apis:jar}"/>
<pathelement location="${apache-xerces:resolver:jar}"/>
Modified: components/pc/trunk/test/servers/tomcat6/src/test/common.xml
===================================================================
--- components/pc/trunk/test/servers/tomcat6/src/test/common.xml 2011-01-07 15:13:01 UTC (rev 5709)
+++ components/pc/trunk/test/servers/tomcat6/src/test/common.xml 2011-01-07 15:17:53 UTC (rev 5710)
@@ -46,12 +46,11 @@
<pathelement location="${jboss:jboss-common-logging-log4j:jar}"/>
</path>
- <path id="jboss-microcontainer">
+ <path id="jboss-xb">
<pathelement location="${org.jboss:jbossxb:jar}"/>
</path>
<path id="portal-common">
- <pathelement location="${org.gatein.common:common-mc:jar}"/>
</path>
<path id="portal-common-shared">
15 years, 3 months
gatein SVN: r5709 - in components/pc/trunk/test/servers/tomcat6: src/test and 1 other directory.
by do-not-reply@jboss.org
Author: julien_viet
Date: 2011-01-07 10:13:01 -0500 (Fri, 07 Jan 2011)
New Revision: 5709
Modified:
components/pc/trunk/test/servers/tomcat6/pom.xml
components/pc/trunk/test/servers/tomcat6/src/test/build.xml
components/pc/trunk/test/servers/tomcat6/src/test/common.xml
Log:
GTNPC-46 : more diet
Modified: components/pc/trunk/test/servers/tomcat6/pom.xml
===================================================================
--- components/pc/trunk/test/servers/tomcat6/pom.xml 2011-01-07 14:39:32 UTC (rev 5708)
+++ components/pc/trunk/test/servers/tomcat6/pom.xml 2011-01-07 15:13:01 UTC (rev 5709)
@@ -359,50 +359,6 @@
</not>
</condition>
- <property name="dependency.log4j.jar" value="${maven.dependency.apache-log4j.log4j.jar.path}"/>
- <property name="dependency.commons-logging.jar" value="${maven.dependency.commons-logging.commons-logging.jar.path}"/>
- <property name="dependency.commons-httpclient.jar" value="${maven.dependency.commons-httpclient.commons-httpclient.jar.path}"/>
- <property name="dependency.activation.jar" value="${maven.dependency.javax.activation.activation.jar.path}"/>
- <property name="dependency.junit.jar" value="${maven.dependency.junit.junit.jar.path}"/>
- <property name="dependency.jsr168api.jar" value="${maven.dependency.javax.portlet.portlet-api.jar.path}"/>
- <property name="dependency.ccpp.jar" value="${maven.dependency.javax.ccpp.ccpp.jar.path}"/>
- <property name="dependency.jaxb.jar" value="${maven.dependency.sun-jaxb.jaxb-api.jar.path}"/>
-
- <property name="dependency.portal-common-common.jar" value="${maven.dependency.org.gatein.common.common-common.jar.path}"/>
- <property name="dependency.portal-common-mc.jar" value="${maven.dependency.org.gatein.common.common-mc.jar.path}"/>
- <property name="dependency.portal-common-logging.jar" value="${maven.dependency.org.gatein.common.common-logging.jar.path}"/>
- <property name="dependency.slf4j-simple.jar" value="${maven.dependency.org.slf4j.slf4j-simple.jar.path}"/>
- <property name="dependency.slf4j-api.jar" value="${maven.dependency.org.slf4j.slf4j-api.jar.path}"/>
-
- <property name="dependency.portal-wci-wci.jar" value="${maven.dependency.org.gatein.wci.wci-wci.jar.path}"/>
- <property name="dependency.portal-wci-tomcat.jar" value="${maven.dependency.org.gatein.wci.wci-tomcat6.jar.path}"/>
-
- <property name="dependency.portal-portlet-portlet.jar" value="${maven.dependency.org.gatein.pc.pc-portlet.jar.path}"/>
- <property name="dependency.portal-portlet-controller.jar" value="${maven.dependency.org.gatein.pc.pc-controller.jar.path}"/>
- <property name="dependency.portal-portlet-mc.jar" value="${maven.dependency.org.gatein.pc.pc-mc.jar.path}"/>
- <property name="dependency.portal-portlet-api.jar" value="${maven.dependency.org.gatein.pc.pc-api.jar.path}"/>
-
- <property name="dependency.jboss-unit.jar" value="${maven.dependency.org.jboss.unit.jboss-unit.jar.path}"/>
- <property name="dependency.jboss-unit-remote.jar" value="${maven.dependency.org.jboss.unit.jboss-unit-remote.jar.path}"/>
- <property name="dependency.portal-test.jar" value="${maven.dependency.org.jboss.unit.portal-test.jar.path}"/>
- <property name="dependency.portal-test-generic.jar" value="${maven.dependency.org.jboss.unit.portal-test-generic.jar.path}"/>
- <property name="dependency.jboss-remoting.jar" value="${maven.dependency.org.jboss.remoting.jboss-remoting.jar.path}"/>
-
- <property name="dependency.concurrent.jar" value="${maven.dependency.concurrent.concurrent.jar.path}"/>
- <property name="dependency.trove.jar" value="${maven.dependency.trove.trove.jar.path}"/>
- <property name="dependency.jboss-logging-spi.jar" value="${maven.dependency.jboss.jboss-common-logging-spi.jar.path}"/>
- <property name="dependency.jboss-logging-jdk.jar" value="${maven.dependency.jboss.jboss-common-logging-jdk.jar.path}"/>
- <property name="dependency.jboss-logging-log4j.jar" value="${maven.dependency.jboss.jboss-common-logging-log4j.jar.path}"/>
- <property name="dependency.jboss-common-core.jar" value="${maven.dependency.org.jboss.jboss-common-core.jar.path}"/>
- <property name="dependency.resolver.jar" value="${maven.dependency.apache-xerces.resolver.jar.path}"/>
- <property name="dependency.xercesImpl.jar" value="${maven.dependency.apache-xerces.xercesImpl.jar.path}"/>
- <property name="dependency.xml-apis.jar" value="${maven.dependency.apache-xerces.xml-apis.jar.path}"/>
- <property name="dependency.jbossxb.jar" value="${maven.dependency.org.jboss.jbossxb.jar.path}"/>
- <property name="dependency.jboss-serialization.jar" value="${maven.dependency.jboss.jboss-serialization.jar.path}"/>
-
- <property name="dependency.apache-jstl.jar" value="${maven.dependency.apache-taglibs.jstl.jar.path}"/>
- <property name="dependency.apache-standard.jar" value="${maven.dependency.apache-taglibs.standard.jar.path}"/>
-
<!-- location of common.xml shared between the different server's build.xml -->
<!--<property name="common.xml.file" value="${test.common.xml}"/>-->
<property name="common.xml.file" value="${basedir}/src/test/common.xml"/>
Modified: components/pc/trunk/test/servers/tomcat6/src/test/build.xml
===================================================================
--- components/pc/trunk/test/servers/tomcat6/src/test/build.xml 2011-01-07 14:39:32 UTC (rev 5708)
+++ components/pc/trunk/test/servers/tomcat6/src/test/build.xml 2011-01-07 15:13:01 UTC (rev 5709)
@@ -20,9 +20,9 @@
<path refid="portal-portlet"/>
<path refid="jboss-unit"/>
<path refid="jboss-microcontainer"/>
- <pathelement path="${dependency.xercesImpl.jar}"/>
- <pathelement path="${dependency.resolver.jar}"/>
- <pathelement path="${dependency.xml-apis.jar}"/>
+ <pathelement location="${apache-xerces:xerces:jar}"/>
+ <pathelement location="${apache-xerces:xml-apis:jar}"/>
+ <pathelement location="${apache-xerces:resolver:jar}"/>
</path>
<path id="Tomcat-6.0-shared">
@@ -31,14 +31,14 @@
<path refid="portal-portlet-shared"/>
<path refid="jboss-unit-shared"/>
<path refid="jboss-logging"/>
- <path location="${dependency.jboss-common-core.jar}"/>
- <path location="${dependency.log4j.jar}"/>
- <path location="${dependency.concurrent.jar}"/>
- <path location="${dependency.activation.jar}"/>
- <path location="${dependency.jaxb.jar}"/>
- <path location="${dependency.ccpp.jar}"/>
- <path location="${dependency.jboss-serialization.jar}"/>
- <path location="${dependency.portal-wci-tomcat.jar}"/>
+ <pathelement location="${org.jboss:jboss-common-core:jar}"/>
+ <pathelement location="${apache-log4j:log4j:jar}"/>
+ <pathelement location="${concurrent:concurrent:jar}"/>
+ <pathelement location="${javax.activation:activation:jar}"/>
+ <pathelement location="${sun-jaxb:jaxb-api:jar}"/>
+ <pathelement location="${javax.ccpp:ccpp:jar}"/>
+ <pathelement location="${jboss:jboss-serialization:jar}"/>
+ <pathelement location="${org.gatein.wci:wci-tomcat6:jar}"/>
</path>
<target name="tests" unless="maven.test.skip">
Modified: components/pc/trunk/test/servers/tomcat6/src/test/common.xml
===================================================================
--- components/pc/trunk/test/servers/tomcat6/src/test/common.xml 2011-01-07 14:39:32 UTC (rev 5708)
+++ components/pc/trunk/test/servers/tomcat6/src/test/common.xml 2011-01-07 15:13:01 UTC (rev 5709)
@@ -41,53 +41,53 @@
<echo message="Preparing environment"/>
<path id="jboss-logging">
- <pathelement path="${dependency.jboss-logging-spi.jar}"/>
- <pathelement path="${dependency.jboss-logging-jdk.jar}"/>
- <pathelement path="${dependency.jboss-logging-log4j.jar}"/>
+ <pathelement location="${jboss:jboss-common-logging-spi:jar}"/>
+ <pathelement location="${jboss:jboss-common-logging-jdk:jar}"/>
+ <pathelement location="${jboss:jboss-common-logging-log4j:jar}"/>
</path>
<path id="jboss-microcontainer">
- <pathelement path="${dependency.jbossxb.jar}"/>
+ <pathelement location="${org.jboss:jbossxb:jar}"/>
</path>
<path id="portal-common">
- <pathelement path="${dependency.portal-common-mc.jar}"/>
+ <pathelement location="${org.gatein.common:common-mc:jar}"/>
</path>
<path id="portal-common-shared">
- <pathelement path="${dependency.portal-common-common.jar}"/>
- <pathelement path="${dependency.portal-common-logging.jar}"/>
- <pathelement path="${dependency.slf4j-simple.jar}"/>
- <pathelement path="${dependency.slf4j-api.jar}"/>
+ <pathelement location="${org.gatein.common:common-common:jar}"/>
+ <pathelement location="${org.gatein.common:common-logging:jar}"/>
+ <pathelement location="${org.slf4j:slf4j-simple:jar}"/>
+ <pathelement location="${org.slf4j:slf4j-api:jar}"/>
</path>
<path id="portal-web">
</path>
<path id="portal-web-shared">
- <pathelement path="${dependency.portal-wci-wci.jar}"/>
+ <pathelement location="${org.gatein.wci:wci-wci:jar}"/>
</path>
<path id="portal-portlet">
- <pathelement path="${dependency.portal-portlet-controller.jar}"/>
- <pathelement path="${dependency.portal-portlet-mc.jar}"/>
+ <pathelement location="${org.gatein.pc:pc-controller:jar}"/>
+ <pathelement location="${org.gatein.pc:pc-mc:jar}"/>
</path>
<path id="portal-portlet-shared">
- <path location="${dependency.portal-portlet-portlet.jar}"/>
- <path location="${dependency.portal-portlet-api.jar}"/>
- <path location="${dependency.jsr168api.jar}"/>
+ <pathelement location="${org.gatein.pc:pc-portlet:jar}"/>
+ <pathelement location="${org.gatein.pc:pc-api:jar}"/>
+ <pathelement location="${javax.portlet:portlet-api:jar}"/>
</path>
<path id="jboss-unit">
</path>
<path id="jboss-unit-shared">
- <pathelement path="${dependency.jboss-unit.jar}"/>
- <pathelement path="${dependency.jboss-unit-remote.jar}"/>
- <pathelement path="${dependency.portal-test-generic.jar}"/>
- <pathelement path="${dependency.portal-test.jar}"/>
- <pathelement path="${dependency.jboss-remoting.jar}"/>
+ <pathelement location="${org.jboss.unit:jboss-unit:jar}"/>
+ <pathelement location="${org.jboss.unit:jboss-unit-remote:jar}"/>
+ <pathelement location="${org.jboss.unit:portal-test-generic:jar}"/>
+ <pathelement location="${org.jboss.unit:portal-test:jar}"/>
+ <pathelement location="${org.jboss.remoting:jboss-remoting:jar}"/>
</path>
</target>
15 years, 3 months
gatein SVN: r5708 - components/pc/trunk/test/servers/tomcat6/src/test.
by do-not-reply@jboss.org
Author: julien_viet
Date: 2011-01-07 09:39:32 -0500 (Fri, 07 Jan 2011)
New Revision: 5708
Modified:
components/pc/trunk/test/servers/tomcat6/src/test/build.xml
Log:
damn indentation
Modified: components/pc/trunk/test/servers/tomcat6/src/test/build.xml
===================================================================
--- components/pc/trunk/test/servers/tomcat6/src/test/build.xml 2011-01-07 14:37:46 UTC (rev 5707)
+++ components/pc/trunk/test/servers/tomcat6/src/test/build.xml 2011-01-07 14:39:32 UTC (rev 5708)
@@ -14,32 +14,32 @@
<property name="test.remote.server.name" value="RemoteTomcat_6_0"/>
<property name="cargo.container.id" value="tomcat6x"/>
- <path id="Tomcat-6.0">
- <path refid="portal-common"/>
- <path refid="portal-web"/>
- <path refid="portal-portlet"/>
- <path refid="jboss-unit"/>
- <path refid="jboss-microcontainer"/>
- <pathelement path="${dependency.xercesImpl.jar}"/>
- <pathelement path="${dependency.resolver.jar}"/>
- <pathelement path="${dependency.xml-apis.jar}"/>
- </path>
+ <path id="Tomcat-6.0">
+ <path refid="portal-common"/>
+ <path refid="portal-web"/>
+ <path refid="portal-portlet"/>
+ <path refid="jboss-unit"/>
+ <path refid="jboss-microcontainer"/>
+ <pathelement path="${dependency.xercesImpl.jar}"/>
+ <pathelement path="${dependency.resolver.jar}"/>
+ <pathelement path="${dependency.xml-apis.jar}"/>
+ </path>
- <path id="Tomcat-6.0-shared">
- <path refid="portal-common-shared"/>
- <path refid="portal-web-shared"/>
- <path refid="portal-portlet-shared"/>
- <path refid="jboss-unit-shared"/>
- <path refid="jboss-logging"/>
- <path location="${dependency.jboss-common-core.jar}"/>
- <path location="${dependency.log4j.jar}"/>
- <path location="${dependency.concurrent.jar}"/>
- <path location="${dependency.activation.jar}"/>
- <path location="${dependency.jaxb.jar}"/>
- <path location="${dependency.ccpp.jar}"/>
- <path location="${dependency.jboss-serialization.jar}"/>
- <path location="${dependency.portal-wci-tomcat.jar}"/>
- </path>
+ <path id="Tomcat-6.0-shared">
+ <path refid="portal-common-shared"/>
+ <path refid="portal-web-shared"/>
+ <path refid="portal-portlet-shared"/>
+ <path refid="jboss-unit-shared"/>
+ <path refid="jboss-logging"/>
+ <path location="${dependency.jboss-common-core.jar}"/>
+ <path location="${dependency.log4j.jar}"/>
+ <path location="${dependency.concurrent.jar}"/>
+ <path location="${dependency.activation.jar}"/>
+ <path location="${dependency.jaxb.jar}"/>
+ <path location="${dependency.ccpp.jar}"/>
+ <path location="${dependency.jboss-serialization.jar}"/>
+ <path location="${dependency.portal-wci-tomcat.jar}"/>
+ </path>
<target name="tests" unless="maven.test.skip">
15 years, 3 months
gatein SVN: r5707 - components/pc/trunk/test/servers/tomcat6/src/test.
by do-not-reply@jboss.org
Author: julien_viet
Date: 2011-01-07 09:37:46 -0500 (Fri, 07 Jan 2011)
New Revision: 5707
Modified:
components/pc/trunk/test/servers/tomcat6/src/test/build.xml
components/pc/trunk/test/servers/tomcat6/src/test/common.xml
Log:
move tomcat specific stuff to tomcat specific build file
Modified: components/pc/trunk/test/servers/tomcat6/src/test/build.xml
===================================================================
--- components/pc/trunk/test/servers/tomcat6/src/test/build.xml 2011-01-07 14:29:18 UTC (rev 5706)
+++ components/pc/trunk/test/servers/tomcat6/src/test/build.xml 2011-01-07 14:37:46 UTC (rev 5707)
@@ -14,7 +14,57 @@
<property name="test.remote.server.name" value="RemoteTomcat_6_0"/>
<property name="cargo.container.id" value="tomcat6x"/>
+ <path id="Tomcat-6.0">
+ <path refid="portal-common"/>
+ <path refid="portal-web"/>
+ <path refid="portal-portlet"/>
+ <path refid="jboss-unit"/>
+ <path refid="jboss-microcontainer"/>
+ <pathelement path="${dependency.xercesImpl.jar}"/>
+ <pathelement path="${dependency.resolver.jar}"/>
+ <pathelement path="${dependency.xml-apis.jar}"/>
+ </path>
+
+ <path id="Tomcat-6.0-shared">
+ <path refid="portal-common-shared"/>
+ <path refid="portal-web-shared"/>
+ <path refid="portal-portlet-shared"/>
+ <path refid="jboss-unit-shared"/>
+ <path refid="jboss-logging"/>
+ <path location="${dependency.jboss-common-core.jar}"/>
+ <path location="${dependency.log4j.jar}"/>
+ <path location="${dependency.concurrent.jar}"/>
+ <path location="${dependency.activation.jar}"/>
+ <path location="${dependency.jaxb.jar}"/>
+ <path location="${dependency.ccpp.jar}"/>
+ <path location="${dependency.jboss-serialization.jar}"/>
+ <path location="${dependency.portal-wci-tomcat.jar}"/>
+ </path>
+
<target name="tests" unless="maven.test.skip">
+
+ <property environment="env"/>
+
+ <!--If properties are not in command line check if they are set in env-->
+ <condition property="TOMCAT_6_0_HOME" value="${env.TOMCAT_6_0_HOME}">
+ <and>
+ <isset property="env.TOMCAT_6_0_HOME"/>
+ <not>
+ <isset property="TOMCAT_6_0_HOME"/>
+ </not>
+ </and>
+ </condition>
+ <echo message="TOMCAT_6_0_HOME: ${TOMCAT_6_0_HOME}"/>
+ <fail message="Please set the environment variable TOMCAT_6_0_HOME">
+ <condition>
+ <and>
+ <not>
+ <isset property="TOMCAT_6_0_HOME"/>
+ </not>
+ </and>
+ </condition>
+ </fail>
+
<antcall target="tests.common"/>
</target>
Modified: components/pc/trunk/test/servers/tomcat6/src/test/common.xml
===================================================================
--- components/pc/trunk/test/servers/tomcat6/src/test/common.xml 2011-01-07 14:29:18 UTC (rev 5706)
+++ components/pc/trunk/test/servers/tomcat6/src/test/common.xml 2011-01-07 14:37:46 UTC (rev 5707)
@@ -10,7 +10,7 @@
<property name="test.dir" value="${target.dir}/integration-tests"/>
<property name="test.cargo.dir" value="${test.dir}/cargo/"/>
- <target name="tests.common" depends="prepare_env, evaluate_properties.init" >
+ <target name="tests.common" depends="prepare_env" >
<echo message="compile classpath: ${compile_classpath}"/>
<echo message="runtime classpath: ${runtime_classpath}"/>
@@ -22,7 +22,6 @@
<antcall target="package-tests"/>
- <antcall target="evaluate_properties.all"/>
<antcall target="test.container-servlet"/>
</target>
@@ -91,69 +90,8 @@
<pathelement path="${dependency.jboss-remoting.jar}"/>
</path>
- <path id="Tomcat-6.0">
- <path refid="portal-common"/>
- <path refid="portal-web"/>
- <path refid="portal-portlet"/>
- <path refid="jboss-unit"/>
- <path refid="jboss-microcontainer"/>
- <pathelement path="${dependency.xercesImpl.jar}"/>
- <pathelement path="${dependency.resolver.jar}"/>
- <pathelement path="${dependency.xml-apis.jar}"/>
- </path>
-
- <path id="Tomcat-6.0-shared">
- <path refid="portal-common-shared"/>
- <path refid="portal-web-shared"/>
- <path refid="portal-portlet-shared"/>
- <path refid="jboss-unit-shared"/>
- <path refid="jboss-logging"/>
- <path location="${dependency.jboss-common-core.jar}"/>
- <path location="${dependency.log4j.jar}"/>
- <path location="${dependency.concurrent.jar}"/>
- <path location="${dependency.activation.jar}"/>
- <path location="${dependency.jaxb.jar}"/>
- <path location="${dependency.ccpp.jar}"/>
- <path location="${dependency.jboss-serialization.jar}"/>
- <path location="${dependency.portal-wci-tomcat.jar}"/>
- </path>
-
</target>
- <!-- Check which servlet containers are known -->
- <target name="evaluate_properties.init">
-
- <property environment="env"/>
-
- <!--If properties are not in command line check if they are set in env-->
- <condition property="TOMCAT_6_0_HOME" value="${env.TOMCAT_6_0_HOME}">
- <and>
- <isset property="env.TOMCAT_6_0_HOME"/>
- <not>
- <isset property="TOMCAT_6_0_HOME"/>
- </not>
- </and>
- </condition>
-
- <echo message="TOMCAT_6_0_HOME: ${TOMCAT_6_0_HOME}"/>
- </target>
-
- <target name="evaluate_properties.tomcat">
- <fail message="Please set the environment variable TOMCAT_6_0_HOME">
- <condition>
- <and>
- <not>
- <isset property="TOMCAT_6_0_HOME"/>
- </not>
- </and>
- </condition>
- </fail>
- </target>
-
- <target name="evaluate_properties.all">
- <antcall target="evaluate_properties.tomcat"/>
- </target>
-
<macrodef name="package-ext-test">
<attribute name="test"/>
<sequential>
15 years, 3 months
gatein SVN: r5706 - components/pc/trunk/test/servers/tomcat6/src/test.
by do-not-reply@jboss.org
Author: julien_viet
Date: 2011-01-07 09:29:18 -0500 (Fri, 07 Jan 2011)
New Revision: 5706
Modified:
components/pc/trunk/test/servers/tomcat6/src/test/common.xml
Log:
GTNPC-46 : remove what is not needed
Modified: components/pc/trunk/test/servers/tomcat6/src/test/common.xml
===================================================================
--- components/pc/trunk/test/servers/tomcat6/src/test/common.xml 2011-01-07 13:47:58 UTC (rev 5705)
+++ components/pc/trunk/test/servers/tomcat6/src/test/common.xml 2011-01-07 14:29:18 UTC (rev 5706)
@@ -72,7 +72,6 @@
<path id="portal-portlet">
<pathelement path="${dependency.portal-portlet-controller.jar}"/>
<pathelement path="${dependency.portal-portlet-mc.jar}"/>
- <pathelement path="${dependency.portal-portlet-tests.jar}"/>
</path>
<path id="portal-portlet-shared">
@@ -92,45 +91,6 @@
<pathelement path="${dependency.jboss-remoting.jar}"/>
</path>
- <path id="JBoss-4.2">
- <path refid="portal-common"/>
- <path refid="portal-web"/>
- <path refid="portal-portlet"/>
- <path refid="jboss-microcontainer"/>
- <path location="${dependency.jboss-common-core.jar}"/>
- </path>
-
- <path id="JBoss-4.2-shared">
- <path refid="portal-common-shared"/>
- <path refid="portal-web-shared"/>
- <path refid="portal-portlet-shared"/>
- <path refid="jboss-unit-shared"/>
- <path location="${dependency.ccpp.jar}"/>
- <path location="${dependency.portal-wci-tomcat.jar}"/>
- </path>
-
- <path id="JBoss-5.1">
- <path refid="portal-common"/>
- <path refid="portal-web"/>
- <path refid="portal-portlet"/>
- <path refid="jboss-microcontainer"/>
- <path location="${dependency.jboss-common-core.jar}"/>
- </path>
-
- <path id="JBoss-5.1-shared">
- <path refid="portal-common-shared"/>
- <path refid="portal-web-shared"/>
- <path refid="portal-portlet-shared"/>
- <path refid="jboss-unit-shared"/>
- <path location="${dependency.ccpp.jar}"/>
- <path location="${dependency.portal-wci-tomcat.jar}"/>
-
- <!-- paths needed for remote jboss deployment -->
- <path location="${dependency.cargo-jboss-deployer.jar}"/>
- <path location="${dependency.jboss-profile-service.jar}"/>
- <path location="${dependency.cargo-core-container-jboss.jar}"/>
- </path>
-
<path id="Tomcat-6.0">
<path refid="portal-common"/>
<path refid="portal-web"/>
@@ -140,7 +100,6 @@
<pathelement path="${dependency.xercesImpl.jar}"/>
<pathelement path="${dependency.resolver.jar}"/>
<pathelement path="${dependency.xml-apis.jar}"/>
- <pathelement path="${dependency.trove.jar}"/>
</path>
<path id="Tomcat-6.0-shared">
@@ -159,62 +118,6 @@
<path location="${dependency.portal-wci-tomcat.jar}"/>
</path>
- <path id="Tomcat-7.0">
- <path refid="portal-common"/>
- <path refid="portal-web"/>
- <path refid="portal-portlet"/>
- <path refid="jboss-unit"/>
- <path refid="jboss-microcontainer"/>
- <pathelement path="${dependency.xercesImpl.jar}"/>
- <pathelement path="${dependency.resolver.jar}"/>
- <pathelement path="${dependency.xml-apis.jar}"/>
- <pathelement path="${dependency.trove.jar}"/>
- </path>
-
- <path id="Tomcat-7.0-shared">
- <path refid="portal-common-shared"/>
- <path refid="portal-web-shared"/>
- <path refid="portal-portlet-shared"/>
- <path refid="jboss-unit-shared"/>
- <path refid="jboss-logging"/>
- <path location="${dependency.jboss-common-core.jar}"/>
- <path location="${dependency.log4j.jar}"/>
- <path location="${dependency.concurrent.jar}"/>
- <path location="${dependency.activation.jar}"/>
- <path location="${dependency.jaxb.jar}"/>
- <path location="${dependency.ccpp.jar}"/>
- <path location="${dependency.jboss-serialization.jar}"/>
- <path location="${dependency.portal-wci-tomcat.jar}"/>
- </path>
-
- <path id="Jetty-6.1">
- <path refid="portal-common"/>
- <path refid="portal-web"/>
- <path refid="portal-portlet"/>
- <path refid="jboss-unit"/>
- <path refid="jboss-microcontainer"/>
- <pathelement path="${dependency.xercesImpl.jar}"/>
- <pathelement path="${dependency.resolver.jar}"/>
- <pathelement path="${dependency.xml-apis.jar}"/>
- <pathelement path="${dependency.trove.jar}"/>
- </path>
-
- <path id="Jetty-6.1-shared">
- <path refid="portal-common-shared"/>
- <path refid="portal-web-shared"/>
- <path refid="portal-portlet-shared"/>
- <path refid="jboss-unit-shared"/>
- <path refid="jboss-logging"/>
- <path location="${dependency.jboss-common-core.jar}"/>
- <path location="${dependency.log4j.jar}"/>
- <path location="${dependency.concurrent.jar}"/>
- <path location="${dependency.activation.jar}"/>
- <path location="${dependency.jaxb.jar}"/>
- <path location="${dependency.ccpp.jar}"/>
- <path location="${dependency.jboss-serialization.jar}"/>
- <path location="${dependency.portal-wci-jetty.jar}"/>
- </path>
-
</target>
<!-- Check which servlet containers are known -->
@@ -223,22 +126,6 @@
<property environment="env"/>
<!--If properties are not in command line check if they are set in env-->
- <condition property="JBOSS_4_2_HOME" value="${env.JBOSS_4_2_HOME}">
- <and>
- <isset property="env.JBOSS_4_2_HOME"/>
- <not>
- <isset property="JBOSS_4_2_HOME"/>
- </not>
- </and>
- </condition>
- <condition property="JBOSS_5_1_HOME" value="${env.JBOSS_5_1_HOME}">
- <and>
- <isset property="env.JBOSS_5_1_HOME"/>
- <not>
- <isset property="JBOSS_5_1_HOME"/>
- </not>
- </and>
- </condition>
<condition property="TOMCAT_6_0_HOME" value="${env.TOMCAT_6_0_HOME}">
<and>
<isset property="env.TOMCAT_6_0_HOME"/>
@@ -247,28 +134,8 @@
</not>
</and>
</condition>
- <condition property="TOMCAT_7_0_HOME" value="${env.TOMCAT_7_0_HOME}">
- <and>
- <isset property="env.TOMCAT_7_0_HOME"/>
- <not>
- <isset property="TOMCAT_7_0_HOME"/>
- </not>
- </and>
- </condition>
- <condition property="JETTY_6_1_HOME" value="${env.JETTY_6_1_HOME}">
- <and>
- <isset property="env.JETTY_6_1_HOME"/>
- <not>
- <isset property="JETTY_6_1_HOME"/>
- </not>
- </and>
- </condition>
- <echo message="JBOSS_4_2_HOME: ${JBOSS_4_2_HOME}"/>
- <echo message="JBOSS_5_1_HOME: ${JBOSS_5_1_HOME}"/>
<echo message="TOMCAT_6_0_HOME: ${TOMCAT_6_0_HOME}"/>
- <echo message="TOMCAT_7_0_HOME: ${TOMCAT_7_0_HOME}"/>
- <echo message="JETTY_6_1_HOME: ${JETTY_6_1_HOME}"/>
</target>
<target name="evaluate_properties.tomcat">
@@ -283,42 +150,7 @@
</fail>
</target>
- <target name="evaluate_properties.jetty">
- <fail message="Please set the environment variable JETTY_6_1_HOME">
- <condition>
- <and>
- <not>
- <isset property="JETTY_6_1_HOME"/>
- </not>
- </and>
- </condition>
- </fail>
- </target>
-
- <target name="evaluate_properties.jboss">
- <fail message="Please set the environment variables JBOSS_4_2_HOME">
- <condition>
- <and>
- <not>
- <isset property="JBOSS_4_2_HOME"/>
- </not>
- </and>
- </condition>
- </fail>
- <fail message="Please set the environment variable JBOSS_5_1_HOME">
- <condition>
- <and>
- <not>
- <isset property="JBOSS_5_1_HOME"/>
- </not>
- </and>
- </condition>
- </fail>
- </target>
-
<target name="evaluate_properties.all">
- <antcall target="evaluate_properties.jboss"/>
- <antcall target="evaluate_properties.jetty"/>
<antcall target="evaluate_properties.tomcat"/>
</target>
@@ -446,21 +278,19 @@
<package-jsr286-ext-test test="portletmode"/>
<!-- -->
- <copy todir="${test.temp.dir}/${test.server.name}-${test.server.version}/portlet-test-war">
- <fileset dir="${target}/test-classes/portlet-test-war"/>
- </copy>
- <copy todir="${test.temp.dir}/${test.server.name}-${test.server.version}/portlet-test-war/WEB-INF/lib" flatten="true">
+ <copy todir="${target}/test-classes/portlet-test-war/WEB-INF/lib" flatten="true">
<path refid="${test.server.name}-${test.server.version}"/>
<path>
<pathelement location="${org.gatein.pc:pc-test-core:jar}"/>
<pathelement location="${org.gatein.pc:pc-test-core:test-jar:tests}"/>
</path>
</copy>
-
<mkdir dir="${test.temp.lib}/${test.server.name}-${test.server.version}"/>
- <jar jarfile="${test.temp.lib}/${test.server.name}-${test.server.version}/portlet-test.war">
- <fileset dir="${test.temp.dir}/${test.server.name}-${test.server.version}/portlet-test-war"/>
- </jar>
+ <war
+ destfile="${test.temp.lib}/${test.server.name}-${test.server.version}/portlet-test.war"
+ needxmlfile="false">
+ <fileset dir="${target}/test-classes/portlet-test-war"/>
+ </war>
</target>
@@ -511,44 +341,4 @@
</target>
-<!--
- <target name="package-tck-portal" depends="prepare_env">
-
- <property name="tck" value="${target}/tck"/>
- <property name="tck-server" value="${tck}/${test.server.name}-${test.server.version}"/>
-
- <mkdir dir="${tck}"/>
- <mkdir dir="${tck-server}"/>
-
- <jar jarfile="${target}/portlet-test-lib.jar">
- <fileset dir="${target}/classes" excludes="org/gatein/pc/portal/samples/**"/>
- </jar>
-
- <copy todir="${tck-server}/portlet-tck-war">
- <fileset dir="${target}/classes/portlet-tck-war"/>
- </copy>
- <copy todir="${tck-server}/portlet-tck-war">
- <fileset dir="${target}/classes/${test.server.name}-${test.server.version}/portlet-tck-war"/>
- </copy>
-
- <copy todir="${tck-server}/portlet-tck-war/WEB-INF/lib" flatten="true">
- <fileset dir="${target}" includes="portlet-test-lib.jar"/>
- <path refid="${test.server.name}-${test.server.version}"/>
- </copy>
-
- <mkdir dir="${tck-server}/tck-portal"/>
-
- <jar jarfile="${tck-server}/tck-portal/portlet-tck.war">
- <fileset dir="${tck-server}/portlet-tck-war"/>
- </jar>
-
- <copy todir="${tck-server}/tck-portal" flatten="true">
- <path refid="${test.server.name}-${test.server.version}-shared"/>
- </copy>
-
- <delete file="${target}/portlet-test-lib.jar"/>
-
- </target>
--->
-
</project>
15 years, 3 months