[asterisk-scf-commits] asterisk-scf/integration/slice.git branch "master" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Fri Oct 29 14:49:46 CDT 2010
branch "master" has been updated
via fec58594e4d1fc7ffd1b6a0ad1a10060d4ae433e (commit)
via ec57f4bad07cab90827d7f7424cd57063b51d8b2 (commit)
via c13e7cb8817129a28492e38a83b3a64b53d987eb (commit)
via 5097d31ff26c2f65eec7fe9e699519318ba0643f (commit)
from e85543594bd7a18969085fd69ba664f37d5dacb3 (commit)
Summary of changes:
.gitignore | 1 +
Core/Discovery/ServiceLocatorEventsIf.ice | 6 +-
Core/Discovery/ServiceLocatorIf.ice | 8 ++--
Core/Endpoint/EndpointIf.ice | 8 ++--
Core/Routing/RoutingIf.ice | 8 ++--
Media/MediaIf.ice | 6 +-
Media/RTP/MediaRTPIf.ice | 8 ++--
SessionCommunications/SessionCommunicationsIf.ice | 8 ++--
System/Logger/LoggerIf.ice | 6 +-
System/Time/TimeIf.ice | 8 ++--
build.xml | 57 +++++++++++++++++++++
lib/maven-ant-tasks-2.1.1.jar | Bin 0 -> 1314262 bytes
pom.xml | 25 +++++++++
13 files changed, 116 insertions(+), 33 deletions(-)
create mode 100644 .gitignore
create mode 100644 build.xml
create mode 100644 lib/maven-ant-tasks-2.1.1.jar
create mode 100644 pom.xml
- Log -----------------------------------------------------------------
commit fec58594e4d1fc7ffd1b6a0ad1a10060d4ae433e
Author: David M. Lee <dlee at digium.com>
Date: Tue Oct 26 14:28:09 2010 -0500
mvn install by default
diff --git a/build.xml b/build.xml
index f3bb5aa..afb6915 100644
--- a/build.xml
+++ b/build.xml
@@ -1,4 +1,4 @@
-<project name="asterisk-scf-api" default="package"
+<project name="asterisk-scf-api" default="install"
xmlns:artifact="antlib:org.apache.maven.artifact.ant">
<property environment="env"/>
<property name="slice2java-dir"
commit ec57f4bad07cab90827d7f7424cd57063b51d8b2
Author: David M. Lee <dlee at digium.com>
Date: Mon Oct 25 09:12:35 2010 -0500
mvn install
diff --git a/build.xml b/build.xml
index 9ab5881..f3bb5aa 100644
--- a/build.xml
+++ b/build.xml
@@ -1,38 +1,57 @@
-<project name="asterisk-scf-api" default="package">
- <property environment="env"/>
- <property name="slice2java-dir" value="target/generated-sources/slice2java"/>
- <property name="classes-dir" value="target/classes"/>
-
- <taskdef name="slice2java" classpath="${env.ICE_HOME}/lib/ant-ice.jar"
- classname="Slice2JavaTask"/>
-
- <target name="generate">
- <mkdir dir="${slice2java-dir}"/>
- <slice2java outputdir="${slice2java-dir}">
- <fileset dir=".">
- <include name="**/*.ice"/>
- </fileset>
- <includepath>
- <pathelement location="."/>
- <pathelement location="${env.ICE_HOME}/slice"/>
- </includepath>
- </slice2java>
- </target>
-
- <target name="compile" depends="generate">
- <mkdir dir="${classes-dir}"/>
- <javac srcdir="${slice2java-dir}" destdir="${classes-dir}">
- <classpath>
- <pathelement location="${env.ICE_HOME}/lib/Ice.jar"/>
- </classpath>
- </javac>
- </target>
-
- <target name="package" depends="compile">
- <jar jarfile="target/asterisk-scf-api.jar" basedir="${classes-dir}"/>
- </target>
-
- <target name="clean">
- <delete dir="target"/>
- </target>
+<project name="asterisk-scf-api" default="package"
+ xmlns:artifact="antlib:org.apache.maven.artifact.ant">
+ <property environment="env"/>
+ <property name="slice2java-dir"
+ value="target/generated-sources/slice2java"/>
+ <property name="classes-dir" value="target/classes"/>
+
+ <property name="mvn.version" value="2.1.1"/>
+
+ <taskdef name="slice2java" classpath="${env.ICE_HOME}/lib/ant-ice.jar"
+ classname="Slice2JavaTask"/>
+
+ <path id="maven-ant-tasks.classpath"
+ path="lib/maven-ant-tasks-${mvn.version}.jar"/>
+ <typedef resource="org/apache/maven/artifact/ant/antlib.xml"
+ uri="antlib:org.apache.maven.artifact.ant"
+ classpathref="maven-ant-tasks.classpath"/>
+
+ <target name="generate-sources">
+ <mkdir dir="${slice2java-dir}"/>
+ <slice2java outputdir="${slice2java-dir}">
+ <fileset dir=".">
+ <include name="**/*.ice"/>
+ </fileset>
+ <includepath>
+ <pathelement location="."/>
+ <pathelement location="${env.ICE_HOME}/slice"/>
+ </includepath>
+ </slice2java>
+ </target>
+
+ <target name="compile" depends="generate-sources">
+ <mkdir dir="${classes-dir}"/>
+ <javac srcdir="${slice2java-dir}" destdir="${classes-dir}">
+ <classpath>
+ <pathelement location="${env.ICE_HOME}/lib/Ice.jar"/>
+ </classpath>
+ </javac>
+ </target>
+
+ <target name="package" depends="compile">
+ <jar jarfile="target/asterisk-scf-api.jar" basedir="${classes-dir}"/>
+ <jar jarfile="target/asterisk-scf-api-src.jar"
+ basedir="${slice2java-dir}"/>
+ </target>
+
+ <target name="install" depends="package">
+ <artifact:pom id="pom" file="pom.xml"/>
+ <artifact:install file="target/asterisk-scf-api.jar" pomrefid="pom">
+ <attach file="target/asterisk-scf-api-src.jar" classifier="src"/>
+ </artifact:install>
+ </target>
+
+ <target name="clean">
+ <delete dir="target"/>
+ </target>
</project>
diff --git a/lib/maven-ant-tasks-2.1.1.jar b/lib/maven-ant-tasks-2.1.1.jar
new file mode 100644
index 0000000..7810a54
Binary files /dev/null and b/lib/maven-ant-tasks-2.1.1.jar differ
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..eaf2be7
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+ http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>com.digium.asteriskscf</groupId>
+ <artifactId>api</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+
+ <name>Asterisk SCF Ice API</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>com.zeroc</groupId>
+ <artifactId>ice</artifactId>
+ <version>${ice.version}</version>
+ </dependency>
+ </dependencies>
+
+ <properties>
+ <ice.version>3.4.1-dgm01</ice.version>
+ </properties>
+</project>
commit c13e7cb8817129a28492e38a83b3a64b53d987eb
Author: David M. Lee <dlee at digium.com>
Date: Mon Oct 11 08:14:07 2010 -0500
Build .jar file.
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..eb5a316
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+target
diff --git a/build.xml b/build.xml
new file mode 100644
index 0000000..9ab5881
--- /dev/null
+++ b/build.xml
@@ -0,0 +1,38 @@
+<project name="asterisk-scf-api" default="package">
+ <property environment="env"/>
+ <property name="slice2java-dir" value="target/generated-sources/slice2java"/>
+ <property name="classes-dir" value="target/classes"/>
+
+ <taskdef name="slice2java" classpath="${env.ICE_HOME}/lib/ant-ice.jar"
+ classname="Slice2JavaTask"/>
+
+ <target name="generate">
+ <mkdir dir="${slice2java-dir}"/>
+ <slice2java outputdir="${slice2java-dir}">
+ <fileset dir=".">
+ <include name="**/*.ice"/>
+ </fileset>
+ <includepath>
+ <pathelement location="."/>
+ <pathelement location="${env.ICE_HOME}/slice"/>
+ </includepath>
+ </slice2java>
+ </target>
+
+ <target name="compile" depends="generate">
+ <mkdir dir="${classes-dir}"/>
+ <javac srcdir="${slice2java-dir}" destdir="${classes-dir}">
+ <classpath>
+ <pathelement location="${env.ICE_HOME}/lib/Ice.jar"/>
+ </classpath>
+ </javac>
+ </target>
+
+ <target name="package" depends="compile">
+ <jar jarfile="target/asterisk-scf-api.jar" basedir="${classes-dir}"/>
+ </target>
+
+ <target name="clean">
+ <delete dir="target"/>
+ </target>
+</project>
commit 5097d31ff26c2f65eec7fe9e699519318ba0643f
Author: David M. Lee <dlee at digium.com>
Date: Fri Oct 8 13:35:57 2010 -0500
Switch to c-style comments for slice2java.
diff --git a/Core/Discovery/ServiceLocatorEventsIf.ice b/Core/Discovery/ServiceLocatorEventsIf.ice
index d63ab10..53fd522 100644
--- a/Core/Discovery/ServiceLocatorEventsIf.ice
+++ b/Core/Discovery/ServiceLocatorEventsIf.ice
@@ -78,8 +78,8 @@ module Discovery
void serviceUnsuspended(string guid);
};
-}; // end module Discovery
+}; /* end module Discovery */
-}; // end module System
+}; /* end module System */
-}; // end module AsteriskSCF
+}; /* end module AsteriskSCF */
diff --git a/Core/Discovery/ServiceLocatorIf.ice b/Core/Discovery/ServiceLocatorIf.ice
index 1217906..a8ee189 100644
--- a/Core/Discovery/ServiceLocatorIf.ice
+++ b/Core/Discovery/ServiceLocatorIf.ice
@@ -179,10 +179,10 @@ module V1
void removeCompare(string compareguid) throws CompareNotFound;
};
-}; // end module V1
+}; /* end module V1 */
-}; // end module Discovery
+}; /* end module Discovery */
-}; // end module Core
+}; /* end module Core */
-}; // end module AsteriskSCF
+}; /* end module AsteriskSCF */
diff --git a/Core/Endpoint/EndpointIf.ice b/Core/Endpoint/EndpointIf.ice
index 4c96e4d..f33773c 100644
--- a/Core/Endpoint/EndpointIf.ice
+++ b/Core/Endpoint/EndpointIf.ice
@@ -73,10 +73,10 @@ module V1
idempotent Ice::StringSeq getManagedEndpointSpecifications();
};
-}; // module V1
+}; /* module V1 */
-}; // module Endpoint
+}; /* module Endpoint */
-}; // module Core
+}; /* module Core */
-}; // module AsteriskSCF
+}; /* module AsteriskSCF */
diff --git a/Core/Routing/RoutingIf.ice b/Core/Routing/RoutingIf.ice
index 7633de8..d4edf9c 100644
--- a/Core/Routing/RoutingIf.ice
+++ b/Core/Routing/RoutingIf.ice
@@ -252,10 +252,10 @@ module V1
};
};
-}; // module V1
+}; /* module V1 */
-}; // module Routing
+}; /* module Routing */
-}; // module Core
+}; /* module Core */
-}; // module AsteriskSCF
+}; /* module AsteriskSCF */
diff --git a/Media/MediaIf.ice b/Media/MediaIf.ice
index 2b845f8..efcc982 100644
--- a/Media/MediaIf.ice
+++ b/Media/MediaIf.ice
@@ -503,8 +503,8 @@ module V1
int maximumBitrate;
};
-}; // end module V1
+}; /* end module V1 */
-}; // end module Media
+}; /* end module Media */
-}; // end module AsteriskSCF
+}; /* end module AsteriskSCF */
diff --git a/Media/RTP/MediaRTPIf.ice b/Media/RTP/MediaRTPIf.ice
index 976e96d..816dfc6 100644
--- a/Media/RTP/MediaRTPIf.ice
+++ b/Media/RTP/MediaRTPIf.ice
@@ -153,10 +153,10 @@ module V1
RTPSession* allocate(AsteriskSCF::Media::V1::FormatSeq formats);
};
-}; // end module V1
+}; /* end module V1 */
-}; // end module RTP
+}; /* end module RTP */
-}; // end module Media
+}; /* end module Media */
-}; // end module AsteriskSCF
+}; /* end module AsteriskSCF */
diff --git a/SessionCommunications/SessionCommunicationsIf.ice b/SessionCommunications/SessionCommunicationsIf.ice
index 0a7359d..faa2c18 100644
--- a/SessionCommunications/SessionCommunicationsIf.ice
+++ b/SessionCommunications/SessionCommunicationsIf.ice
@@ -785,10 +785,10 @@ module V1
void connectBridgedSessionsEvent(Session* sessionToReplace, Session* bridgedSession, OperationResult result);
};
- }; // End of module Event
+ }; /* End of module Event */
-}; // End of module V1
+}; /* End of module V1 */
-}; // End of module SessionCommunications
+}; /* End of module SessionCommunications */
-}; // End of module AsteriskSCF
+}; /* End of module AsteriskSCF */
diff --git a/System/Logger/LoggerIf.ice b/System/Logger/LoggerIf.ice
index 330ff61..dd2f926 100644
--- a/System/Logger/LoggerIf.ice
+++ b/System/Logger/LoggerIf.ice
@@ -137,8 +137,8 @@ module Logging
void configured(Configuration logConfiguration);
};
-}; // Logging
+}; /* Logging */
-}; // System
+}; /* System */
-}; // AsteriskSCF
+}; /* AsteriskSCF */
diff --git a/System/Time/TimeIf.ice b/System/Time/TimeIf.ice
index 0b04d79..0cbb3bd 100644
--- a/System/Time/TimeIf.ice
+++ b/System/Time/TimeIf.ice
@@ -49,10 +49,10 @@ module V1
float scale;
};
-}; // End of V1
+}; /* End of V1 */
-}; // End of Time
+}; /* End of Time */
-}; // End of System
+}; /* End of System */
-}; // End of AsteriskSCF
+}; /* End of AsteriskSCF */
-----------------------------------------------------------------------
--
asterisk-scf/integration/slice.git
More information about the asterisk-scf-commits
mailing list