Author: [email protected] Date: Wed Nov 23 16:17:13 2011 New Revision: 1753 Log:
Added: sandbox/ivol/amdatu-gadget-container/configfiles_AWS/ sandbox/ivol/amdatu-gadget-container/configfiles_AWS/org.amdatu.auth.oauth.consumerregistry.fs.cfg sandbox/ivol/amdatu-gadget-container/configfiles_AWS/org.amdatu.auth.oauth.server.cfg sandbox/ivol/amdatu-gadget-container/configfiles_AWS/org.amdatu.core.cassandra.application.cfg sandbox/ivol/amdatu-gadget-container/configfiles_AWS/org.amdatu.core.config.templates.cfg sandbox/ivol/amdatu-gadget-container/configfiles_AWS/org.amdatu.core.loghandler.cfg sandbox/ivol/amdatu-gadget-container/configfiles_AWS/org.amdatu.core.tenant.cfg sandbox/ivol/amdatu-gadget-container/configfiles_AWS/org.amdatu.gadgetcontainer.mail.service.cfg sandbox/ivol/amdatu-gadget-container/configfiles_AWS/org.amdatu.opensocial.shindig.cfg sandbox/ivol/amdatu-gadget-container/configfiles_AWS/org.apache.felix.http.cfg Modified: sandbox/ivol/amdatu-gadget-container/gadget-container-release/pom.xml sandbox/ivol/amdatu-gadget-container/gadget-container-release/src/main/resources/bin/run.sh sandbox/ivol/amdatu-gadget-container/gadget-container-release/src/main/resources/config/org.amdatu.gadgetcontainer.mail.service.cfg sandbox/ivol/amdatu-gadget-container/tenant-management-gadget/src/main/java/org/amdatu/opensocial/tenant/gadget/service/TenantGadgetImpl.java sandbox/ivol/amdatu-gadget-container/tenant-management-gadget/src/main/resources/static/css/tenant.css sandbox/ivol/amdatu-gadget-container/tenant-management-gadget/src/main/resources/static/js/util.js Added: sandbox/ivol/amdatu-gadget-container/configfiles_AWS/org.amdatu.auth.oauth.consumerregistry.fs.cfg ============================================================================== --- (empty file) +++ sandbox/ivol/amdatu-gadget-container/configfiles_AWS/org.amdatu.auth.oauth.consumerregistry.fs.cfg Wed Nov 23 16:17:13 2011 @@ -0,0 +1,17 @@ +# Copyright (c) 2010, 2011 The Amdatu Foundation +# +# Licensed 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.verning permissions and limitations +# under the License. + +# Consumer store FS datadirectory +datadir=work/consumerregistrystore \ No newline at end of file Added: sandbox/ivol/amdatu-gadget-container/configfiles_AWS/org.amdatu.auth.oauth.server.cfg ============================================================================== --- (empty file) +++ sandbox/ivol/amdatu-gadget-container/configfiles_AWS/org.amdatu.auth.oauth.server.cfg Wed Nov 23 16:17:13 2011 @@ -0,0 +1,49 @@ +# Copyright (c) 2010, 2011 The Amdatu Foundation +# +# Licensed 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.verning permissions and limitations +# under the License. + +# The hostname and portnr +hostname=ec2-46-137-147-103.eu-west-1.compute.amazonaws.com +portnr=80 +authorizeurl=/oauth-server/jsp/authorize.jsp + +# The lifetime of an OAuth request is limited to request.timestamp.maxage. +# This defines the maximum amount of time between the signing of an OAuth +# request (at which point the oauth_timestamp is added to it) and the +# receipt of the request. +# Defaults to 300000 (5 minutes). +request.timestamp.maxage=300000 + +# The lifetime of a request token is limited to request.token.maxage. It must +# be exchanged for an access token before this maxage. If the request token +# reached its maxage it is invalidated and cannot be exchanged for an access +# token anymore. +# Defaults to 300000 (5 minutes). +request.token.maxage=300000 + +# The lifetime of an access token is limited to access.token.maxage. This is +# an absolute maximum; the token always expires after this amount of milliseconds, +# even if the token is still actively used. Can be a negative number, in which case +# the access token does not expire. Can be used in combination with access.token.timeout, +# in which case BOTH apply. +# Defaults to -1 (no maximum age). +access.token.maxage=-1 + +# The access token is invalidated when it is not used (that is; send along +# with an OAuth request) for more then access.token.timeout milliseconds. +# Defaults to 1800000, meaning that the access token becomes invalid when +# it not used for a duration of 30 minutes. +# May be a negative number, in which case the access token does not timeout. +# Can be used in combination with access.token.timeout, in which case BOTH apply. +access.token.timeout=1800000 \ No newline at end of file Added: sandbox/ivol/amdatu-gadget-container/configfiles_AWS/org.amdatu.core.cassandra.application.cfg ============================================================================== --- (empty file) +++ sandbox/ivol/amdatu-gadget-container/configfiles_AWS/org.amdatu.core.cassandra.application.cfg Wed Nov 23 16:17:13 2011 @@ -0,0 +1,106 @@ +# Copyright (c) 2010, 2011 The Amdatu Foundation +# +# Licensed 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.verning permissions and limitations +# under the License. + +# Root work directory of Cassandra log and data files +workdir=cassandra + +# Directory to store Cassandra logfiles +commitlogdir=work/cassandra/commitlog + +# Directory in which the data files are stored +datafiledir=work/cassandra/data + +# Directory in which the caches are saved +savedcachesdir=work/cassandra/saved_caches + +log4j.systemlog=work/cassandra/system.log + +############################### +# Cassandra clustering related properties +############################### + +# Name of the Cassandra cluster to join. If a seed is defined in the 'seeds' property +# that defines a different clustername, a clustername mismatch error will be displayed +# and that seed will not become part of this cluster. +clustername='Amdatu Cassandra Cluster' + +# Comma separated list of IP addresses of nodes in the cluster to connect to. +# Note that does not need to be a full listing of all IP addresses of all nodes +# in the cluster, it may be a subset of it. This property determines with what +# other nodes in the cluster this node will synchronize its data. +# When cassandra is executed in stand-alone mode, this value should be 127.0.0.1 +seeds=127.0.0.1 + +# The IP address of this node that other cassandra nodes will use to connect to. +# This IP address must thus be accessible from the other nodes in the cluster (to +# be precise; those that provided this node as one of its seeds). +# When cassandra is executed in stand-alone mode, this value should be localhost +listen_address=127.0.0.1 + +# The default replication factor of new keyspaces. The replication factor determines +# the amount of nodes on which data is replicated. So if default_replication_factor +# equals 1 and you have a two-node cluster, it is very likely that you will get timeouts +# as it will try to read data only stored on the other node (data is distributed among +# the two nodes). In case all data should be available on all nodes in the cluster, which +# is necessary in case the node should also be able to run stand-alone, the replication +# factor should equal the number of nodes in the cluster. +# Note that upon the very first boot of a node, the replication factor must be 1 as the +# replication factor may never be higher then the amount of nodes in the cluster. Usually +# the replication factor upon first boot is always 1, to be increased at runtime. +default_replication_factor=1 + +# The read consistency level to apply. The read consistencly level determines the +# amount of nodes in the cluster that must reply on a request for providing the latest +# version of some row before the result is returned. Note that if the read consistency +# level is ALL, all nodes in the cluster are effectively down as soon as one node in +# the cluster goes down, as cassandra will block until it received an answer from +# this (unavailable) node before returning the result. +consistency_level_read=ONE + +# The write consistency level to apply. The write consistencly level determines the +# amount of nodes in the cluster that should have received the write request operation +# before the call is returned. Note that if the write consistency level is ALL, all +# nodes in the cluster are effectively down as soon as one node in the cluster goes +# down, as cassandra will block each write operation until this (unavailable) node +# answered. +consistency_level_write=ONE + +# Auto bootstrap should be enabled for nodes that are newly added to an existing Cassandra +# cluster. After that, autobootstrap must be set to false +autobootstrap=false + +# You may leave this field blank in case of a single node cluster. However if you plan +# to later build a cluster including this first instance, it is recommended to set the +# initial token�s value to zero. This simplifies load balancing as you later expand the +# cluster. +initial_token=0 + +# The address to bind the Thrift RPC service to -- clients connect here. +# Usually this is the same value as the listen_address. If you leave this +# blank that is exactly what will happen, so it is recommended to leave this empty +rpc_address= + +# port for Thrift to listen for clients on +rpc_port=9160 + +# storage port +storage_port=7000 + +# The timeout (in seconds) to wait for schema agreement. When a Keyspace or ColumnFamily is added or dropped, +# the thread is blocked until the while cluster agrees upon the schema version (neglecting unreachable nodes). The thread +# is however no longer blocked then the schema agreement timeout. If the timeout kicks in, the Column Family or Keyspace +# is created or dropped, resulting in a possible SchemaDisagreementException internally thrown by Cassandra. +# The default is 30 seconds, schema agreement usually takes place within 5-10 seconds. +schema_agreement_timeout=30 \ No newline at end of file Added: sandbox/ivol/amdatu-gadget-container/configfiles_AWS/org.amdatu.core.config.templates.cfg ============================================================================== --- (empty file) +++ sandbox/ivol/amdatu-gadget-container/configfiles_AWS/org.amdatu.core.config.templates.cfg Wed Nov 23 16:17:13 2011 @@ -0,0 +1,3 @@ +# The work directory in which temporary configuration files are stored +# Note that this directory becomes a subdirectory of /target/work +workdir=config-template-manager \ No newline at end of file Added: sandbox/ivol/amdatu-gadget-container/configfiles_AWS/org.amdatu.core.loghandler.cfg ============================================================================== --- (empty file) +++ sandbox/ivol/amdatu-gadget-container/configfiles_AWS/org.amdatu.core.loghandler.cfg Wed Nov 23 16:17:13 2011 @@ -0,0 +1,5 @@ +# This settings indicates the loglevels of messages that will be printed +# to the console. Can be DEBUG, INFO, WARNING or ERROR. For example if "INFO" +# is defined, only log messages will be printed in the console which have a +# loglevel of INFO or higher (WARNING or ERROR). +console.mininum.loglevel=DEBUG \ No newline at end of file Added: sandbox/ivol/amdatu-gadget-container/configfiles_AWS/org.amdatu.core.tenant.cfg ============================================================================== --- (empty file) +++ sandbox/ivol/amdatu-gadget-container/configfiles_AWS/org.amdatu.core.tenant.cfg Wed Nov 23 16:17:13 2011 @@ -0,0 +1,4 @@ +# Default Tenants +tenant1.id=Default +tenant1.name=Default tenant +tenant1.properties.hostname=ec2-46-137-147-103.eu-west-1.compute.amazonaws.com Added: sandbox/ivol/amdatu-gadget-container/configfiles_AWS/org.amdatu.gadgetcontainer.mail.service.cfg ============================================================================== --- (empty file) +++ sandbox/ivol/amdatu-gadget-container/configfiles_AWS/org.amdatu.gadgetcontainer.mail.service.cfg Wed Nov 23 16:17:13 2011 @@ -0,0 +1,17 @@ +# The SMTP server +mail.smtp.host=none + +# The SMTP server port (optional) +mail.smtp.port= + +# Authorization mechanism of the SMTP server (optional) +mail.smtp.auth= + +# Username required to send emails (optional) +mail.smtp.username= + +# Password of that user (optional) +mail.smtp.password= + +# The email address on who's behalf the mail is send [email protected] \ No newline at end of file Added: sandbox/ivol/amdatu-gadget-container/configfiles_AWS/org.amdatu.opensocial.shindig.cfg ============================================================================== --- (empty file) +++ sandbox/ivol/amdatu-gadget-container/configfiles_AWS/org.amdatu.opensocial.shindig.cfg Wed Nov 23 16:17:13 2011 @@ -0,0 +1,160 @@ +# 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. + +# Location of feature manifests (comma separated) +shindig.features.default=res://features/features.txt + +# Location of container configurations (comma separated) +# NB: this property is set by org.amdatu.opensocial.shindig.module.ConfigurationAdminGuiceModule +shindig.containers.default= + +# A file containing blacklisted gadgets. +shindig.blacklist.file= + +### Inbound OAuth support +# The URL base to use for full OAuth support (three-legged) +shindig.oauth.base-url=/oauth/ +shindig.oauth.authorize-action=/dashboard/authorize.jsp + +### Outbound OAuth support +shindig.signing.state-key= +shindig.signing.key-name=amdatu_public_key +#shindig.signing.key-file=res://conf/oauthkey.pem +shindig.signing.global-callback-url=http://ec2-46-137-147-103.eu-west-1.compute.amazonaws.com/gadgets/oauthcallback +shindig.signing.enable-signed-callbacks=true + +# Set to true if you want to allow the use of 3-legged OAuth tokens when viewer != owner. +# This setting is not recommeneded for pages that allow user-controlled javascript, since +# that javascript could be used to make unauthorized requests on behalf of the viewer of the page +shindig.signing.viewer-access-tokens-enabled=false + +# If enabled here, configuration values can be found in container configuration files. +shindig.locked-domain.enabled=false + +# TODO: This needs to be moved to container configuration. +shindig.content-rewrite.only-allow-excludes=false +shindig.content-rewrite.include-urls=.* +shindig.content-rewrite.exclude-urls= +shindig.content-rewrite.include-tags=body,embed,img,input,link,script,style +shindig.content-rewrite.expires=86400 +shindig.content-rewrite.proxy-url=/gadgets/proxy?container=default&url= +shindig.content-rewrite.concat-url=/gadgets/concat?container=default& +shindig.content-rewrite.enable-split-js-concat=true + +# +# Default set of forced libs to allow for better caching +# +# NOTE: setting this causes the EndToEnd test to fail the opensocial-templates test +shindig.gadget-rewrite.default-forced-libs=core:rpc +#shindig.gadget-rewrite.default-forced-libs= + +# +# Allow supported JavaScript features required by a gadget to be externalized on demand +shindig.gadget-rewrite.externalize-feature-libs=false + +# Configuration for image rewriter +shindig.image-rewrite.max-inmem-bytes = 1048576 +shindig.image-rewrite.max-palette-size = 256 +shindig.image-rewrite.allow-jpeg-conversion = true +shindig.image-rewrite.jpeg-compression = 0.75 +shindig.image-rewrite.min-threshold-bytes = 200 + +# Configuration for the os:Flash tag +shindig.flash.min-version = 9.0.115 + +# Configuration for template rewriter +shindig.template-rewrite.extension-tag-namespace=http://ns.opensocial.org/2009/extensions + +# These values provide default TTLs for HTTP responses that don't use caching headers. +shindig.cache.http.defaultTtl=0 +shindig.cache.http.negativeCacheTtl=0 + +# A default refresh interval for XML files, since there is no natural way for developers to +# specify this value, and most HTTP responses don't include good cache control headers. +# this setting (1) prevents the XML files to be cached forever, handy during development +shindig.cache.xml.refreshInterval=1 + +# Add entries in the form shindig.cache.lru.<name>.capacity to specify capacities for different +# caches when using the LruCacheProvider. +# It is highly recommended that the EhCache implementation be used instead of the LRU cache. +shindig.cache.lru.default.capacity=1000 +shindig.cache.lru.expressions.capacity=1000 +shindig.cache.lru.gadgetSpecs.capacity=1000 +shindig.cache.lru.messageBundles.capacity=1000 +shindig.cache.lru.httpResponses.capacity=10000 + +# The location of the EhCache configuration file. +shindig.cache.ehcache.config=res://org/apache/shindig/common/cache/ehcache/ehcacheConfig.xml + +# True to enable JMX integration with cache stats +shindig.cache.ehcache.jmx.enabled=true + +# true to enable JMX stats. +shindig.cache.ehcache.jmx.stats=true + +# true to skip expensive encoding detection. +# if true, will only attempt to validate utf-8. Assumes all other encodings are ISO-8859-1. +shindig.http.fast-encoding-detection=true + +# Configuration for the HttpFetcher +# Connection timeout, in milliseconds, for requests. +shindig.http.client.connection-timeout-ms=15000 + +# Maximum size, in bytes, of the object we fetched, 0 == no limit +shindig.http.client.max-object-size-bytes=0 + +# Strict-mode parsing for proxy and concat URIs ensures that the authority/host and path +# for the URIs match precisely what is found in the container config for it. This is +# useful where statistics and traffic routing patterns, typically in large installations, +# key on hostname (and occasionally path). Enforcing this does come at the cost that +# mismatches break, which in turn mandates that URI generation always happen in consistent +# fashion, ie. by the class itself or tightly controlled code. +shindig.uri.proxy.use-strict-parsing=false +shindig.uri.concat.use-strict-parsing=false + +# Host:port of the proxy to use while fetching urls. Leave blank if proxy is +# not to be used. +org.apache.shindig.gadgets.http.basicHttpFetcherProxy= + +org.apache.shindig.serviceExpirationDurationMinutes=60 + +# +# Older versions of shindig used 'data' in the json-rpc response format +# The spec calls for using 'result' instead, however to avoid breakage we +# allow you to set it back to the old way here +# +# valid values are +# result - new form +# data - old broken form +# both - return both fields for full compatibility +# +shindig.json-rpc.result-field=result + +# Remap "Internal server error"s received from the basicHttpFetcherProxy server to +# "Bad Gateway error"s, so that it is clear to the user that the proxy server is +# the one that threw the exception. +shindig.accelerate.remapInternalServerError=true + +# shindig.host is not used anymore, but remains here since Guice requires this config +# entry to invoke the container coniguration +shindig.host=null + +shindig.port=80 + +shindig.proxy.remapInternalServerError=false + +workdir=work/shindig \ No newline at end of file Added: sandbox/ivol/amdatu-gadget-container/configfiles_AWS/org.apache.felix.http.cfg ============================================================================== --- (empty file) +++ sandbox/ivol/amdatu-gadget-container/configfiles_AWS/org.apache.felix.http.cfg Wed Nov 23 16:17:13 2011 @@ -0,0 +1,6 @@ +# Skype runs on port 80, Oracle db on 8080. Therefore use this 'arbitrary' port +# Provides properties for the HTTP service (Felix HTTP Bundle or Pax Web) +org.osgi.service.http.port=80 +org.osgi.service.http.port.secure=443 +org.apache.felix.http.debug=true +org.apache.felix.log.storeDebug=true Modified: sandbox/ivol/amdatu-gadget-container/gadget-container-release/pom.xml ============================================================================== --- sandbox/ivol/amdatu-gadget-container/gadget-container-release/pom.xml (original) +++ sandbox/ivol/amdatu-gadget-container/gadget-container-release/pom.xml Wed Nov 23 16:17:13 2011 @@ -29,6 +29,16 @@ <name>Amdatu Gadget Container release</name> + <properties> + <amdatu.log.level>DEBUG</amdatu.log.level> + <amdatu.http.hostname>ec2-46-137-147-103.eu-west-1.compute.amazonaws.com</amdatu.http.hostname> + <amdatu.http.port>80</amdatu.http.port> + <amdatu.https.port>443</amdatu.https.port> + + <mail.smtp.host>none</mail.smtp.host> + <from.address>[email protected]</from.address> + </properties> + <dependencies> <!-- OSGi dependencies --> <dependency> Modified: sandbox/ivol/amdatu-gadget-container/gadget-container-release/src/main/resources/bin/run.sh ============================================================================== --- sandbox/ivol/amdatu-gadget-container/gadget-container-release/src/main/resources/bin/run.sh (original) +++ sandbox/ivol/amdatu-gadget-container/gadget-container-release/src/main/resources/bin/run.sh Wed Nov 23 16:17:13 2011 @@ -1,10 +1,10 @@ #!/bin/bash -# Open a debug port -JAVA_OPTS="-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n" - # Set memory options -JAVA_OPTS="$JAVA_OPTS -Xms256m -Xmx1024m -XX:MaxPermSize=256m" +JAVA_OPTS="-Xms256m -Xmx1024m -XX:MaxPermSize=256m" + +# Set stdout and sterr file locations +JAVA_OPTS="$JAVA_OPTS -out ./work/logs/stdout.log -err ./work/logs/stderr.log" # Felix property file JAVA_OPTS="$JAVA_OPTS -Dfelix.config.properties=file:conf/amdatu-platform.properties" @@ -12,5 +12,8 @@ # Set encoding to UTF-8 JAVA_OPTS="$JAVA_OPTS -Dfile.encoding=utf-8" +# Set the java io tmp dir +JAVA_OPTS="$JAVA_OPTS -Djava.io.tmpdir=./work/tmp" + # Run the platform... java $JAVA_OPTS -jar lib/org.apache.felix.main-${org.apache.felix.main.version}.jar Modified: sandbox/ivol/amdatu-gadget-container/gadget-container-release/src/main/resources/config/org.amdatu.gadgetcontainer.mail.service.cfg ============================================================================== --- sandbox/ivol/amdatu-gadget-container/gadget-container-release/src/main/resources/config/org.amdatu.gadgetcontainer.mail.service.cfg (original) +++ sandbox/ivol/amdatu-gadget-container/gadget-container-release/src/main/resources/config/org.amdatu.gadgetcontainer.mail.service.cfg Wed Nov 23 16:17:13 2011 @@ -1,5 +1,5 @@ # The SMTP server -mail.smtp.host=smtp.gx.nl +mail.smtp.host=${mail.smtp.host} # The SMTP server port (optional) mail.smtp.port= @@ -14,4 +14,4 @@ mail.smtp.password= # The email address on who's behalf the mail is send [email protected] \ No newline at end of file +from.address=${from.address} \ No newline at end of file Modified: sandbox/ivol/amdatu-gadget-container/tenant-management-gadget/src/main/java/org/amdatu/opensocial/tenant/gadget/service/TenantGadgetImpl.java ============================================================================== --- sandbox/ivol/amdatu-gadget-container/tenant-management-gadget/src/main/java/org/amdatu/opensocial/tenant/gadget/service/TenantGadgetImpl.java (original) +++ sandbox/ivol/amdatu-gadget-container/tenant-management-gadget/src/main/java/org/amdatu/opensocial/tenant/gadget/service/TenantGadgetImpl.java Wed Nov 23 16:17:13 2011 @@ -30,6 +30,8 @@ * @author ivol */ public class TenantGadgetImpl implements ResourceProvider { + private static final boolean DEBUG_MODE = false; + private static final String LOCAL_DEV_DIR = "D:/Amdatu-svn/sandbox/ivol/amdatu-gadget-container/tenant-management-gadget/src/main/resources"; @@ -49,26 +51,29 @@ final String pathPrefix = Activator.ALIAS + "/"; if (name != null && name.startsWith(pathPrefix)) { // START debug code - String fileName = null; - if (name.endsWith(".jsp")) { - fileName = name.substring(name.lastIndexOf("/jsp/")); - } else if (name.endsWith(".js")) { - fileName = "/static" + name.substring(name.lastIndexOf("/js/")); - } else if (name.endsWith(".css")) { - fileName = "/static" + name.substring(name.lastIndexOf("/css/")); - } - - if (fileName != null) { - File file = new File(LOCAL_DEV_DIR + fileName); - try { - if (!file.exists()) { - m_logService.log(LogService.LOG_ERROR, "Could not find file '" + file.getAbsolutePath() + "'"); - } else { - return file.toURL(); + if (DEBUG_MODE) { + String fileName = null; + if (name.endsWith(".jsp")) { + fileName = name.substring(name.lastIndexOf("/jsp/")); + } else if (name.endsWith(".js")) { + fileName = "/static" + name.substring(name.lastIndexOf("/js/")); + } else if (name.endsWith(".css")) { + fileName = "/static" + name.substring(name.lastIndexOf("/css/")); + } + + if (fileName != null) { + File file = new File(LOCAL_DEV_DIR + fileName); + try { + if (!file.exists()) { + m_logService.log(LogService.LOG_ERROR, "Could not find file '" + file.getAbsolutePath() + "'"); + } else { + return file.toURL(); + } } + catch (MalformedURLException e) {} } - catch (MalformedURLException e) {} } + //END debug code return m_bundleContext.getBundle().getResource(name.substring(pathPrefix.length())); } Modified: sandbox/ivol/amdatu-gadget-container/tenant-management-gadget/src/main/resources/static/css/tenant.css ============================================================================== --- sandbox/ivol/amdatu-gadget-container/tenant-management-gadget/src/main/resources/static/css/tenant.css (original) +++ sandbox/ivol/amdatu-gadget-container/tenant-management-gadget/src/main/resources/static/css/tenant.css Wed Nov 23 16:17:13 2011 @@ -19,34 +19,9 @@ background: #fff; } -div#statusbar-wrapper { -font-size: 6px; -background: #FF0000; -} - -div.statusbar-wrapper { -font-size: 6px; -background: #FF0000; -} - -div#statusbar-header { -font-size: 6px; -background: #FF0000; -} - -div.statusbar-header { -font-size: 6px; -background: #FF0000; -} - -div.statusbar-header-text { -font-size: 6px; -background: #FF0000; -} - p { font-family: arial, sans-serif; - font-size: 3px; + font-size: 13px; } table th { Modified: sandbox/ivol/amdatu-gadget-container/tenant-management-gadget/src/main/resources/static/js/util.js ============================================================================== --- sandbox/ivol/amdatu-gadget-container/tenant-management-gadget/src/main/resources/static/js/util.js (original) +++ sandbox/ivol/amdatu-gadget-container/tenant-management-gadget/src/main/resources/static/js/util.js Wed Nov 23 16:17:13 2011 @@ -59,7 +59,11 @@ } function getBaseUrl() { - return window.location.protocol +"//" + window.location.hostname + ":" + window.location.port; + var baseUrl = window.location.protocol +"//" + window.location.hostname; + if (window.location.port != "") { + baseurl += ":" + window.location.port; + } + return baseUrl; } function getDefaultParams(contentType, method) {
_______________________________________________ Amdatu-commits mailing list [email protected] http://lists.amdatu.org/mailman/listinfo/amdatu-commits
