Return-Path: 
 <commits-return-34630-apmail-cloudstack-commits-archive=cloudstack.apache.org@cloudstack.apache.org>
X-Original-To: apmail-cloudstack-commits-archive@www.apache.org
Delivered-To: apmail-cloudstack-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 97D231064C
	for <apmail-cloudstack-commits-archive@www.apache.org>;
 Fri, 15 Nov 2013 20:02:48 +0000 (UTC)
Received: (qmail 37484 invoked by uid 500); 15 Nov 2013 20:02:47 -0000
Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org
Received: (qmail 37393 invoked by uid 500); 15 Nov 2013 20:02:47 -0000
Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cloudstack.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cloudstack.apache.org>
List-Post: <mailto:commits@cloudstack.apache.org>
List-Id: <commits.cloudstack.apache.org>
Reply-To: dev@cloudstack.apache.org
Delivered-To: mailing list commits@cloudstack.apache.org
Received: (qmail 37287 invoked by uid 99); 15 Nov 2013 20:02:47 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Nov 2013 20:02:47 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id DD69882F4E2; Fri, 15 Nov 2013 20:02:46 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: bfederle@apache.org
To: commits@cloudstack.apache.org
Date: Fri, 15 Nov 2013 20:02:46 -0000
Message-Id: <ea516aea5fb0467da0b6f3c90191acda@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [01/50] git commit: updated refs/heads/ui-restyle to 06ccb84

Updated Branches:
  refs/heads/ui-restyle 9dd6ff6fc -> 06ccb8473


Fix pom problems causing compilation failures. No master pom was set and this module uses maven standard directory locations


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/34b6a395
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/34b6a395
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/34b6a395

Branch: refs/heads/ui-restyle
Commit: 34b6a395ced605055e28965c7f4e346431a343b2
Parents: c2078cd
Author: Hugo Trippaers <htrippaers@schubergphilis.com>
Authored: Tue Nov 12 17:16:57 2013 +0100
Committer: Hugo Trippaers <htrippaers@schubergphilis.com>
Committed: Tue Nov 12 17:16:57 2013 +0100

----------------------------------------------------------------------
 services/console-proxy-rdp/rdpconsole/pom.xml | 29 +++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/34b6a395/services/console-proxy-rdp/rdpconsole/pom.xml
----------------------------------------------------------------------
diff --git a/services/console-proxy-rdp/rdpconsole/pom.xml b/services/console-proxy-rdp/rdpconsole/pom.xml
index 71d0241..c829f6b 100644
--- a/services/console-proxy-rdp/rdpconsole/pom.xml
+++ b/services/console-proxy-rdp/rdpconsole/pom.xml
@@ -21,16 +21,39 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>rdpclient</groupId>
   <artifactId>cloudstack-service-console-proxy-rdpclient</artifactId>
-  <version>4.3.0-SNAPSHOT</version>
   <packaging>jar</packaging>
-
   <name>Apache CloudStack Console Proxy - RDP Client</name>
-  <url>http://maven.apache.org</url>
+
+  <parent>
+    <groupId>org.apache.cloudstack</groupId>
+    <artifactId>cloudstack-services</artifactId>
+    <version>4.3.0-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 
+  <!-- not parenting to the maven-default pom, as we want this in services -->
+  <build>
+    <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
+    <scriptSourceDirectory>${basedir}/src/main/scripts</scriptSourceDirectory>
+    <testSourceDirectory>${basedir}/src/test/java</testSourceDirectory>
+    <outputDirectory>${basedir}/target/classes</outputDirectory>
+    <testOutputDirectory>${basedir}/target/test-classes</testOutputDirectory>
+    <resources>
+      <resource>
+        <directory>${basedir}/src/main/resources</directory>
+      </resource>
+    </resources>
+    <testResources>
+      <testResource>
+        <directory>${basedir}/src/test/resources</directory>
+      </testResource>
+    </testResources>
+  </build>
+
   <dependencies>
     <dependency>
       <groupId>junit</groupId>