Subversion Repositories WebE

Compare Revisions

Last modification

Ignore whitespace Rev HEAD → Rev 1

/trunk/.project
File deleted
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/WebContent/index.jsp
===================================================================
--- trunk/WebContent/index.jsp (revision 38)
+++ trunk/WebContent/index.jsp (nonexistent)
@@ -1,23 +0,0 @@
-<%@taglib uri="/struts-tags" prefix="s"%>
-<%@ page pageEncoding="UTF-8" %>
-<html>
-<head>
- <title>Login</title>
-</head>
-<body>
-<div id="login">
- <h1>Login</h1>
-
- <s:form action="Login">
- <s:fielderror />
- <s:textfield name="userName" label="Benutzername" />
- <s:password name="pw" label="Passwort" />
- <s:submit value="Login" />
- </s:form>
-
- <p>
- Klicken Sie <a href="index.jsp">hier</a> wenn Sie Ihr Passwort vergessen haben.
- </p>
-</div>
-</body>
-</html>
/trunk/WebContent/index.jsp
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/WebContent/errorHandler.jsp
===================================================================
--- trunk/WebContent/errorHandler.jsp (revision 38)
+++ trunk/WebContent/errorHandler.jsp (nonexistent)
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<%@page isErrorPage="true"%>
-<%@page language="java" contentType="text/html; charset=ISO-8859-1"
- pageEncoding="utf-8"
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Error page</title>
-</head>
-<body>
- Die Seite hat einen Fehler verursacht. Bitte versuchen Sie es
- nochmals.
-</body>
-</html>
\ No newline at end of file
/trunk/WebContent/errorHandler.jsp
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/WebContent/decorators/mainTemplate.jsp
===================================================================
--- trunk/WebContent/decorators/mainTemplate.jsp (revision 38)
+++ trunk/WebContent/decorators/mainTemplate.jsp (nonexistent)
@@ -1,69 +0,0 @@
-<%@ taglib uri="http://www.opensymphony.com/sitemesh/decorator"
- prefix="decorator"
-%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
-
-<c:set var="contextPath" value="${pageContext.request.contextPath}" />
-<c:set var="requestURI" value="${pageContext.request.requestURI}" />
-<c:set var="isUser" value="${fn:contains(requestURI, '/user/')}" />
-<c:set var="isAdmin" value="${fn:contains(requestURI, '/admin/')}" />
-
-<%@ page pageEncoding="UTF-8"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title><decorator:title /> &ndash; Ontologie-Editor</title>
- <link rel="stylesheet" type="text/css"
- href="${contextPath}/resources/css/main.css"
- />
- </head>
- <body>
- <%-- Only serves as a container for the different site elements!
- Do not write any text directly into the page-container div! --%>
- <div id="page-container">
- <div id="header">
- <table width="100%" border="0" cellspacing="0" cellpadding="0"
- class="header"
- >
- <tr>
- <td>&nbsp;</td>
- <td
- style="vertical-align: top; font-size: 12pt; text-align: right;"
- >
- <div>
- <strong>Ontologie-Editor</strong><br /> von
- Michael&nbsp;Moos<br /> &amp; Thomas&nbsp;Lahn
- </div></td>
- <td width="56" class="no_padding"><img
- src="${contextPath}/resources/images/ontology_logo.jpg"
- width="56" height="56" alt="logo"
- />
- </td>
- </tr>
- </table>
- </div>
-
- <!-- Load nav bars depending on the location -->
- <c:if test="${isUser}">
- <div id="navbar">
- <%@ include file="/user/nav.jsp"%>
- </div>
- </c:if>
- <c:if test="${isAdmin}">
- <div id="navbar">
- <%@ include file="/admin/nav.jsp"%>
- </div>
- </c:if>
-
- <!-- Content DIV loaded via decorator -->
- <div id="content">
- <decorator:body />
- </div>
-
- </div>
- </body>
-</html>
\ No newline at end of file
/trunk/WebContent/decorators/mainTemplate.jsp
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/WebContent/WEB-INF/sitemesh-decorator.tld
===================================================================
--- trunk/WebContent/WEB-INF/sitemesh-decorator.tld (revision 38)
+++ trunk/WebContent/WEB-INF/sitemesh-decorator.tld (nonexistent)
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
-
-<taglib>
-
- <tlibversion>1.0</tlibversion>
- <jspversion>1.1</jspversion>
- <shortname>SiteMesh Decorator Tags</shortname>
- <uri>sitemesh-decorator</uri>
-
- <tag>
- <name>head</name>
- <tagclass>com.opensymphony.module.sitemesh.taglib.decorator.HeadTag</tagclass>
- <bodycontent>JSP</bodycontent>
- </tag>
-
- <tag>
- <name>body</name>
- <tagclass>com.opensymphony.module.sitemesh.taglib.decorator.BodyTag</tagclass>
- <bodycontent>JSP</bodycontent>
- </tag>
-
- <tag>
- <name>title</name>
- <tagclass>com.opensymphony.module.sitemesh.taglib.decorator.TitleTag</tagclass>
- <bodycontent>JSP</bodycontent>
- <attribute>
- <name>default</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- </tag>
-
- <tag>
- <name>getProperty</name>
- <tagclass>com.opensymphony.module.sitemesh.taglib.decorator.PropertyTag</tagclass>
- <bodycontent>JSP</bodycontent>
- <attribute>
- <name>property</name>
- <required>true</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <name>default</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <name>writeEntireProperty</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- </tag>
-
- <tag>
- <name>usePage</name>
- <tagclass>com.opensymphony.module.sitemesh.taglib.decorator.UsePageTag</tagclass>
- <teiclass>com.opensymphony.module.sitemesh.taglib.decorator.UsePageTEI</teiclass>
- <bodycontent>JSP</bodycontent>
- <attribute>
- <name>id</name>
- <required>true</required>
- <rtexprvalue>false</rtexprvalue>
- </attribute>
- </tag>
-
- <tag>
- <name>useHtmlPage</name>
- <tagclass>com.opensymphony.module.sitemesh.taglib.decorator.UsePageTag</tagclass>
- <teiclass>com.opensymphony.module.sitemesh.taglib.decorator.UseHTMLPageTEI</teiclass>
- <bodycontent>JSP</bodycontent>
- <attribute>
- <name>id</name>
- <required>true</required>
- <rtexprvalue>false</rtexprvalue>
- </attribute>
- </tag>
-
-</taglib>
\ No newline at end of file
/trunk/WebContent/WEB-INF/sitemesh-decorator.tld
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/WebContent/WEB-INF/decorators.xml
===================================================================
--- trunk/WebContent/WEB-INF/decorators.xml (revision 38)
+++ trunk/WebContent/WEB-INF/decorators.xml (nonexistent)
@@ -1,7 +0,0 @@
-<decorators defaultdir="/decorators">
- <decorator name="main" page="mainTemplate.jsp">
- <pattern>*</pattern>
- </decorator>
-
- <!-- <decorator name="panel" page="main.jsp"/> -->
-</decorators>
\ No newline at end of file
/trunk/WebContent/WEB-INF/decorators.xml
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/WebContent/WEB-INF/lib/slf4j-log4j12-1.5.8.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/WebContent/WEB-INF/lib/slf4j-log4j12-1.5.8.jar
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: trunk/WebContent/WEB-INF/lib/jstl-1.2.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/WebContent/WEB-INF/lib/jstl-1.2.jar
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: trunk/WebContent/WEB-INF/lib/jta-1.1.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/WebContent/WEB-INF/lib/jta-1.1.jar
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: trunk/WebContent/WEB-INF/lib/hsqldb.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/WebContent/WEB-INF/lib/hsqldb.jar
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: trunk/WebContent/WEB-INF/lib/dom4j-1.6.1.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/WebContent/WEB-INF/lib/dom4j-1.6.1.jar
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: trunk/WebContent/WEB-INF/lib/struts2-core-2.1.6.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/WebContent/WEB-INF/lib/struts2-core-2.1.6.jar
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: trunk/WebContent/WEB-INF/lib/commons-io-1.3.2.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/WebContent/WEB-INF/lib/commons-io-1.3.2.jar
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: trunk/WebContent/WEB-INF/lib/sitemesh-2.4.1.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/WebContent/WEB-INF/lib/sitemesh-2.4.1.jar
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: trunk/WebContent/WEB-INF/lib/ognl-2.6.11.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/WebContent/WEB-INF/lib/ognl-2.6.11.jar
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: trunk/WebContent/WEB-INF/lib/hibernate3.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/WebContent/WEB-INF/lib/hibernate3.jar
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: trunk/WebContent/WEB-INF/lib/hibernate-validator.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/WebContent/WEB-INF/lib/hibernate-validator.jar
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: trunk/WebContent/WEB-INF/lib/commons-collections-3.1.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/WebContent/WEB-INF/lib/commons-collections-3.1.jar
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: trunk/WebContent/WEB-INF/lib/antlr-2.7.6.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/WebContent/WEB-INF/lib/antlr-2.7.6.jar
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: trunk/WebContent/WEB-INF/lib/xwork-2.1.2-sources.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/WebContent/WEB-INF/lib/xwork-2.1.2-sources.jar
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: trunk/WebContent/WEB-INF/lib/commons-lang-2.3.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/WebContent/WEB-INF/lib/commons-lang-2.3.jar
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: trunk/WebContent/WEB-INF/lib/commons-fileupload-1.2.1.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/WebContent/WEB-INF/lib/commons-fileupload-1.2.1.jar
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: trunk/WebContent/WEB-INF/lib/commons-logging-1.1.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/WebContent/WEB-INF/lib/commons-logging-1.1.jar
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: trunk/WebContent/WEB-INF/lib/hibernate-annotations.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/WebContent/WEB-INF/lib/hibernate-annotations.jar
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: trunk/WebContent/WEB-INF/lib/junit-3.8.1.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/WebContent/WEB-INF/lib/junit-3.8.1.jar
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: trunk/WebContent/WEB-INF/lib/slf4j-api-1.5.8.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/WebContent/WEB-INF/lib/slf4j-api-1.5.8.jar
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: trunk/WebContent/WEB-INF/lib/log4j-1.2.15.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/WebContent/WEB-INF/lib/log4j-1.2.15.jar
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: trunk/WebContent/WEB-INF/lib/struts2-fullhibernatecore-plugin-1.4-GA.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/WebContent/WEB-INF/lib/struts2-fullhibernatecore-plugin-1.4-GA.jar
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: trunk/WebContent/WEB-INF/lib/javassist-3.9.0.GA.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/WebContent/WEB-INF/lib/javassist-3.9.0.GA.jar
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: trunk/WebContent/WEB-INF/lib/struts2-convention-plugin-2.1.6.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/WebContent/WEB-INF/lib/struts2-convention-plugin-2.1.6.jar
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: trunk/WebContent/WEB-INF/lib/hibernate-commons-annotations.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/WebContent/WEB-INF/lib/hibernate-commons-annotations.jar
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: trunk/WebContent/WEB-INF/lib/ejb3-persistence.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/WebContent/WEB-INF/lib/ejb3-persistence.jar
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: trunk/WebContent/WEB-INF/lib/mysql-connector-java-5.1.13-bin.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/WebContent/WEB-INF/lib/mysql-connector-java-5.1.13-bin.jar
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: trunk/WebContent/WEB-INF/lib/freemarker-2.3.13.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/WebContent/WEB-INF/lib/freemarker-2.3.13.jar
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: trunk/WebContent/WEB-INF/lib/xwork-2.1.2.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/WebContent/WEB-INF/lib/xwork-2.1.2.jar
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: trunk/WebContent/WEB-INF/web.xml
===================================================================
--- trunk/WebContent/WEB-INF/web.xml (revision 38)
+++ trunk/WebContent/WEB-INF/web.xml (nonexistent)
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
- id="WebApp_ID" version="2.5">
- <display-name>WebEngineeringProject</display-name>
-
-
- <!-- Start of SiteMesh stuff -->
- <filter>
- <filter-name>sitemesh</filter-name>
- <filter-class>com.opensymphony.module.sitemesh.filter.PageFilter</filter-class>
- </filter>
-
- <filter-mapping>
- <filter-name>sitemesh</filter-name>
- <url-pattern>*</url-pattern>
- </filter-mapping>
- <!-- End of SiteMesh stuff -->
-
-
- <!-- Begin struts 2 -->
- <filter>
- <filter-name>struts2</filter-name>
- <filter-class>
- org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter
- </filter-class>
- </filter>
- <filter-mapping>
- <filter-name>struts2</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
- <!-- End struts 2 -->
-
- <welcome-file-list>
- <welcome-file>index.jsp</welcome-file>
- </welcome-file-list>
-
-</web-app>
\ No newline at end of file
/trunk/WebContent/WEB-INF/web.xml
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/WebContent/WEB-INF/sitemesh-page.tld
===================================================================
--- trunk/WebContent/WEB-INF/sitemesh-page.tld (revision 38)
+++ trunk/WebContent/WEB-INF/sitemesh-page.tld (nonexistent)
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
-
-<taglib>
-
- <tlibversion>1.0</tlibversion>
- <jspversion>1.1</jspversion>
- <shortname>SiteMesh Page Tags</shortname>
- <uri>sitemesh-page</uri>
-
- <tag>
- <name>applyDecorator</name>
- <tagclass>com.opensymphony.module.sitemesh.taglib.page.ApplyDecoratorTag</tagclass>
- <bodycontent>JSP</bodycontent>
- <attribute>
- <name>name</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <name>page</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <name>title</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <name>id</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <name>contentType</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <name>encoding</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- </tag>
-
- <!-- Deprecated tag: use applyDecorator instead -->
- <tag>
- <name>apply-decorator</name>
- <tagclass>com.opensymphony.module.sitemesh.taglib.page.ApplyDecoratorTag</tagclass>
- <bodycontent>JSP</bodycontent>
- <attribute>
- <name>name</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <name>page</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <name>title</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <name>id</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <name>contentType</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <name>encoding</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- </tag>
-
- <tag>
- <name>param</name>
- <tagclass>com.opensymphony.module.sitemesh.taglib.page.ParamTag</tagclass>
- <bodycontent>JSP</bodycontent>
- <attribute>
- <name>name</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- </tag>
-
-</taglib>
\ No newline at end of file
/trunk/WebContent/WEB-INF/sitemesh-page.tld
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/WebContent/WEB-INF/sitemesh.xml
===================================================================
--- trunk/WebContent/WEB-INF/sitemesh.xml (revision 38)
+++ trunk/WebContent/WEB-INF/sitemesh.xml (nonexistent)
@@ -1,60 +0,0 @@
-<sitemesh>
-
- <page-parsers>
- <parser default="true"
- class="com.opensymphony.module.sitemesh.parser.DefaultPageParser" />
- <parser content-type="text/html"
- class="com.opensymphony.module.sitemesh.parser.FastPageParser" />
- </page-parsers>
-
- <decorator-mappers>
-
- <mapper
- class="com.opensymphony.module.sitemesh.mapper.PageDecoratorMapper">
- <param name="property.1" value="meta.decorator" />
- <param name="property.2" value="decorator" />
- </mapper>
-
- <mapper
- class="com.opensymphony.module.sitemesh.mapper.FrameSetDecoratorMapper">
- </mapper>
-
- <mapper
- class="com.opensymphony.module.sitemesh.mapper.AgentDecoratorMapper">
- <param name="match.MSIE" value="ie" />
- <param name="match.Mozilla [" value="ns" />
- <param name="match.Opera" value="opera" />
- <param name="match.Lynx" value="lynx" />
- </mapper>
-
- <mapper
- class="com.opensymphony.module.sitemesh.mapper.PrintableDecoratorMapper">
- <param name="decorator" value="printable" />
- <param name="parameter.name" value="printable" />
- <param name="parameter.value" value="true" />
- </mapper>
-
- <mapper
- class="com.opensymphony.module.sitemesh.mapper.RobotDecoratorMapper">
- <param name="decorator" value="robot" />
- </mapper>
-
- <mapper
- class="com.opensymphony.module.sitemesh.mapper.ParameterDecoratorMapper">
- <param name="decorator.parameter" value="decorator" />
- <param name="parameter.name" value="confirm" />
- <param name="parameter.value" value="true" />
- </mapper>
-
- <mapper
- class="com.opensymphony.module.sitemesh.mapper.FileDecoratorMapper">
- </mapper>
-
- <mapper
- class="com.opensymphony.module.sitemesh.mapper.ConfigDecoratorMapper">
- <param name="config" value="/WEB-INF/decorators.xml" />
- </mapper>
-
- </decorator-mappers>
-
-</sitemesh>
\ No newline at end of file
/trunk/WebContent/WEB-INF/sitemesh.xml
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/WebContent/admin/users.jsp
===================================================================
--- trunk/WebContent/admin/users.jsp (revision 38)
+++ trunk/WebContent/admin/users.jsp (nonexistent)
@@ -1,93 +0,0 @@
-<%@taglib uri="/struts-tags" prefix="s"%>
-<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<c:set var="contextPath" value="${pageContext.request.contextPath}" />
-
-<html>
- <head>
- <title>User bearbeiten</title>
- </head>
- <body>
- <s:if test="edit">
- <h1>Benutzer bearbeiten</h1>
- </s:if>
- <s:else>
- <h1>Benutzer verwalten</h1>
- </s:else>
-
- <s:if test="added">
- <p>Der Benutzer <b><s:text name="savedUser.username"/>
- <s:if test="savedUser.firstname.length() > 0 || savedUser.lastname.length() > 0))">
- (<s:text name="savedUser.firstname"/> <s:text name="savedUser.lastname"/>)
- </s:if></b>
- wurde hinzugef&uuml;gt.</p>
- </s:if>
-
- <s:if test="edit">
- <h2>Dieser Benutzer</h2>
- </s:if>
- <s:else>
- <h2>Neuer Benutzer</h2>
- </s:else>
-
- <s:form action="saveUser">
- <s:hidden name="edit" />
- <s:hidden name="user.id" />
- <s:textfield name="user.username" label="Benutzername" required="true" />
- <s:password name="user.password" label="Passwort" required="true" />
- <s:textfield name="user.firstname" label="Vorname" />
- <s:textfield name="user.lastname" label="Nachname" />
- <s:checkbox name="user.admin" label="Administrator" />
-
- <s:if test="edit">
- <s:submit type="button"><img src="${contextPath}/resources/icons/tick.png" alt="" />
- Speichern</s:submit>
- </s:if>
- <s:else>
- <s:submit type="button"><img src="${contextPath}/resources/icons/add.png" alt="" />
- Hinzuf&uuml;gen
- </s:submit>
- </s:else>
- </s:form>
-
- <h2>Registrierte Benutzer</h2>
- <s:if test="userList.size() == 0">
- <p>Keine Benutzer gefunden</p>
- </s:if>
- <s:else>
- <table>
- <thead>
- <tr>
- <th>Benutzername</th>
- <th>Vorname</th>
- <th>Nachname</th>
- <th>Administrator</th>
- </tr>
- </thead>
- <tbody>
- <s:iterator value="userList" status="stat">
- <tr>
- <td><s:property value="username" /></td>
- <td><s:property value="firstname" /></td>
- <td><s:property value="lastname" /></td>
- <td><s:if test="admin">ja</s:if><s:else>nein</s:else></td>
-
- <td><s:url id="editURL" action="editUser">
- <s:param name="id" value="%{id}"></s:param>
- </s:url> <s:a href="%{editURL}">
- <img src="${contextPath}/resources/icons/page_white_edit.png" alt="edit" />
- </s:a></td>
-
- <s:if test="!admin">
- <td><s:url id="deleteURL" action="deleteUser">
- <s:param name="id" value="%{id}"></s:param>
- </s:url> <s:a href="%{deleteURL}">
- <img src="${contextPath}/resources/icons/delete.png" alt="delete" />
- </s:a></td>
- </s:if>
- </tr>
- </s:iterator>
- </tbody>
- </table>
- </s:else>
- </body>
-</html>
\ No newline at end of file
/trunk/WebContent/admin/users.jsp
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/WebContent/admin/adminError.jsp
===================================================================
--- trunk/WebContent/admin/adminError.jsp (revision 38)
+++ trunk/WebContent/admin/adminError.jsp (nonexistent)
@@ -1,12 +0,0 @@
-<html>
-<head>
-<title>Fehler</title>
-</head>
-<body>
-
- <p>
- Es ist ein Fehler aufgetreten. Bitte gehen Sie zurück und versuchen
- Sie es erneut. Wir bitten um Entschuldigung
- </p>
-</body>
-</html>
/trunk/WebContent/admin/adminError.jsp
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/WebContent/admin/nav.jsp
===================================================================
--- trunk/WebContent/admin/nav.jsp (revision 38)
+++ trunk/WebContent/admin/nav.jsp (nonexistent)
@@ -1,14 +0,0 @@
-<div id="navigation">
- <ul>
- <li>Verwalten
- <ul>
- <li><a href="listUsers">Benutzer</a></li>
- <li><a href="listRelTypes">Beziehungstypen</a></li>
- </ul></li>
-
- <li>Benutzerfunktionen
- <ul>
- <li><a href="../Logout">Abmelden</a></li>
- </ul></li>
- </ul>
-</div>
/trunk/WebContent/admin/nav.jsp
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/WebContent/admin/main.jsp
===================================================================
--- trunk/WebContent/admin/main.jsp (revision 38)
+++ trunk/WebContent/admin/main.jsp (nonexistent)
@@ -1,11 +0,0 @@
-<html>
-<head>
-<title>Startseite - Administration</title>
-</head>
-<body>
-
- <p>
- Willkommen im Admin-Bereich
- </p>
-</body>
-</html>
/trunk/WebContent/admin/main.jsp
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/WebContent/admin/relTypes.jsp
===================================================================
--- trunk/WebContent/admin/relTypes.jsp (revision 38)
+++ trunk/WebContent/admin/relTypes.jsp (nonexistent)
@@ -1,87 +0,0 @@
-<%@taglib uri="/struts-tags" prefix="s"%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
-<c:set var="contextPath" value="${pageContext.request.contextPath}" />
-
-<html>
- <head>
- <s:if test="edit">
- <title>Beziehungstyp bearbeiten</title>
- </s:if>
- <s:else>
- <title>Beziehungstypen verwalten</title>
- </s:else>
- </head>
- <body>
- <s:if test="edit">
- <h1>Beziehungstyp bearbeiten</h1>
- </s:if>
- <s:else>
- <h1>Beziehungstypen verwalten</h1>
- </s:else>
-
- <s:if test="edit">
- <h2>Dieser Beziehungstyp</h2>
- </s:if>
- <s:else>
- <h2>Neuer Beziehungstyp</h2>
- </s:else>
-
- <s:form action="doRelTypeAdd">
- <s:hidden name="relType.id" />
- <s:textfield name="relType.nameFrom"
- label="Bezeichnung A --> B (z.B. &quot;ist Sohn von&quot;)"
- />
- <s:textfield name="relType.nameTo"
- label="Bezeichnung A <-- B (z.B. &quot;ist Vater von&quot;)"
- />
-
- <s:if test="edit">
- <s:submit type="button"><img src="${contextPath}/resources/icons/tick.png" alt="" />
- Speichern</s:submit>
- </s:if>
- <s:else>
- <s:submit type="button"><img src="${contextPath}/resources/icons/add.png" alt="" />
- Hinzuf&uuml;gen
- </s:submit>
- </s:else>
- </s:form>
-
- <h2>Definierte Beziehungstypen</h2>
- <s:if test="relTypeList.size() == 0">
- <p>Keine Beziehungstypen gefunden</p>
- </s:if>
- <s:else>
- <table>
- <tr>
- <th>A &rarr; B</th>
- <th>A &larr; B</th>
- </tr>
- <s:iterator value="relTypeList" status="stat">
- <tr>
- <td><s:property value="nameFrom" /></td>
- <td><s:property value="nameTo" /></td>
-
- <td><s:url id="editURL" action="editRelType">
- <s:param name="id" value="%{id}"></s:param>
- </s:url> <s:a href="%{editURL}">
- <img
- src="${contextPath}/resources/icons/page_white_edit.png"
- alt="edit"
- />
- </s:a>
- </td>
-
- <td><s:url id="deleteURL" action="deleteRelType">
- <s:param name="id" value="%{id}"></s:param>
- </s:url> <s:a href="%{deleteURL}">
- <img src="${contextPath}/resources/icons/delete.png"
- alt="delete"
- />
- </s:a>
- </td>
- </tr>
- </s:iterator>
- </table>
- </s:else>
- </body>
-</html>
\ No newline at end of file
/trunk/WebContent/admin/relTypes.jsp
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/WebContent/resources/images/ontology_logo.jpg
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/WebContent/resources/images/ontology_logo.jpg
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: trunk/WebContent/resources/css/main.css
===================================================================
--- trunk/WebContent/resources/css/main.css (revision 38)
+++ trunk/WebContent/resources/css/main.css (nonexistent)
@@ -1,586 +0,0 @@
-@charset "utf-8";
-
-body,td {
- font-family: Arial, Helvetica, sans-serif;
- font-size: 12px;
- text-align: left;
-}
-
-body {
- margin: 0;
- padding: 12px;
-}
-
-h1 {
- font-size: 21px;
- margin-top: 0;
- padding: 0;
-}
-
-h2 {
- font-size: 14px;
- margin-top: 20px;
- margin-bottom: 10px;
-}
-
-h3 {
- font-size: 13px;
-}
-
-img {
- border: none;
-}
-
-/*********************************************************************************
- * Links
- */
-a,a:link,a:visited,a:active {
- color: #AA0000;
- text-decoration: none;
-}
-
-a:hover {
- color: #E30119;
- text-decoration: underline;
-}
-
-a.button {
- display: block;
- font-weight: bold;
- padding-top: 4px;
- padding-left: 6px;
- padding-bottom: 4px;
- padding-right: 6px;
- border-top: 1px solid #BBBBBB;
- border-left: 1px solid #BBBBBB;
- border-bottom: 1px solid #555555;
- border-right: 1px solid #555555;
- background-color: #CCCCCC;
- text-decoration: none;
-}
-
-a.button:active {
- text-decoration: none;
-}
-
-a.button:visited {
- text-decoration: none;
-}
-
-a.button:hover {
- background-color: #DDDDDD;
-}
-
-/*********************************************************************************
- * Table
- */
-table {
- margin: 5px 0 10px 0;
- padding: 0;
-}
-
-table.no_margin {
- margin: 0;
-}
-
-td,th {
- text-align: left;
- vertical-align: top;
- margin: 0;
- padding: 0 10px 0 0;
-}
-
-/* style for listing tables */
-table.list {
- border-collapse: collapse;
-}
-
-table.list td,table.list th {
- margin: 0;
- padding: 3px 30px 3px 1px;
- border-bottom: 1px solid #EBEBED;
-}
-
-/* style for form tables */
-table.form {
- border-collapse: collapse;
-}
-
-table.form td,table.form th {
- margin: 0;
- padding: 0 20px 6px 0;
-}
-
-/* Header table */
-table.header {
- margin: 0;
-}
-
-td.no_padding {
- padding: 0;
-}
-
-/*********************************************************************************
- * Custom classes
- */
-div#page-container {
- width: 100%;
-}
-
-div#header {
- width: 100%;
- padding: 0 0 15px 0;
- border-bottom: #EBEBED 10px solid;
-}
-
-div#navbar {
- float: left;
- width: 200px;
- padding: 15px 20px 0 0;
- position: absolute;
-}
-
-div#content {
- padding: 15px 0 10px 230px;
-
- /*
- border-color:#F00;
- border-style:solid;
- border-width:thick;
- */
-}
-
-.right {
- text-align: right;
-}
-
-span.normal {
- font-weight: normal;
-}
-
-/*********************************************************************************
- * Login
- */
-div#login {
- background-color: #EBEBED;
- width: 350px;
- padding: 10px;
- margin: auto;
- margin-top: 50px;
- text-align: center;
-}
-
-p.login_failed {
- color: #DD0000;
- font-weight: bold;
- background-color: #FFFFFF;
-}
-
-input.login {
- width: 200px;
-}
-
-/*********************************************************************************
- * Dialogs
- */
-div.errormsg { /* Old version by Kevin */
- font-weight: bold;
- border: 2px solid black;
- color: #DD0000;
- position: fixed;
- left: 10px;
- top: 10px;
- padding-top: 20px;
- padding-bottom: 20px;
- margin-left: 40%;
- text-align: center;
- font-size: 16px;
- width: 20%;
-}
-
-#dialog {
- font-weight: bold;
- border: 5px solid #888888;
- color: #000000;
- position: absolute;
- left: 30%;
- top: 20px;
- text-align: left;
- padding: 10px 10px 10px 80px;
- margin: 20px auto auto auto;
- width: 40%;
- background-color: #FFFFFF;
- z-index: 1000;
-}
-
-#overlay {
- position: absolute;
- top: 0;
- left: 0;
- width: 100%;
- height: 100%;
- z-index: 500;
- background-color: #EBEBED;
- opacity: 0.7; /* for real browsers */
- -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)";
- /* for IE 8 */
- filter: alpha(opacity = 70); /* for IE */
-}
-
-/* Error dialog */
-.dialog_error {
- background: #FFFFFF url(../../resources/images/dialog_error.png)
- no-repeat 10px 10px;
-}
-
-/* Warning dialog */
-.dialog_warning {
- background: #FFFFFF url(../../resources/images/dialog_warning.png)
- no-repeat 10px 10px;
-}
-
-/* Info dialog */
-.dialog_info {
- background: #FFFFFF url(../../resources/images/dialog_info.png)
- no-repeat 10px 10px;
-}
-
-/* Question dialog */
-.dialog_question {
- background: #FFFFFF url(../../resources/images/dialog_question.png)
- no-repeat 10px 10px;
-}
-
-/*Notification*/
-.notificationIcon {
- float: right;
-}
-
-/* Title of dialog box */
-#dialog_title {
- float: left;
- width: 100%;
- margin: 0 0 10px 0;
- padding: 0;
- font-size: 14px;
- font-weight: bold;
-}
-
-/* Text of dialog box */
-#dialog_text {
- float: left;
- width: 100%;
- margin: 0 0 10px 0;
- padding: 0;
- font-size: 14px;
- font-weight: normal;
-}
-
-/* Buttons in dialog box */
-#dialog_buttons {
- width: 100%;
- float: left;
- text-align: right;
- margin: 0;
- padding: 10px 0 0 0;
-}
-
-/*********************************************************************************
- * Navigation on the left side
- */
-
-/* First level of navigation */
-#navigation ul {
- list-style-type: none;
- list-style-image: none;
- margin: 0;
- padding: 0;
-}
-
-#navigation ul li {
- border-bottom: #EBEBED 7px solid;
- margin: 0;
- padding: 5px 0 5px 1px;
- font-weight: bold;
- font-size: 13px;
-}
-
-/* Second level of navigation */
-#navigation ul li ul {
- padding: 3px 0 0 0;
-}
-
-#navigation ul li ul li {
- border-bottom: none;
- margin: 0;
- padding: 3px 0 3px 7px;
- font-weight: normal;
- font-size: 12px;
-}
-
-/* Links in navigation area */
-#navigation a {
- text-decoration: none;
- color: #333333;
-}
-
-#navigation a:active {
- text-decoration: none;
- color: #E30119;
-}
-
-#navigation a:hover {
- text-decoration: none;
- color: #E30119;
-}
-
-/*********************************************************************************
- * General page formatting
- */
-p.main_hint {
- font-weight: bold;
-}
-
-p.sub_hint {
-
-}
-
-.hidden {
- display: none;
-}
-
-/*********************************************************************************
- * Customer selection
- */
-div.customer {
- border-left: #EBEBED 5px solid;
- padding: 0 5px 0 5px;
- margin: 0 0 10px 0;
- float: left;
- width: 300px;
-}
-
-/*********************************************************************************
- * Change Request
- */
-table.change_request {
- margin-left: -10px;
-}
-
-/*********************************************************************************
- * Form fields
- */
-.input_ro { /* read only input field */
- border: 2px solid #EEEEEE;
- background-color: #EEEEEE;
-}
-
-.invalid { /* Fields containing invalid input */
- border: 2px #FF0000 solid;
- background-color: #FFDDDD;
-}
-
-/*********************************************************************************
- * Shopping cart
- */
-table.shopping_cart {
- border-collapse: collapse;
- border: 3px solid #EBEBED;
-}
-
-table.shopping_cart td {
- padding: 3px 10px 3px 3px;
- border-top: 1px solid #EBEBED;
-}
-
-table.shopping_cart tr.additional_info td {
- border-top: none;
-}
-
-table.shopping_cart td.right,table.shopping_cart th.right {
- padding-right: 20px;
-}
-
-table.shopping_cart th {
- padding: 3px 10px 3px 3px;
- background-color: #EBEBED;
-}
-
-/* Buttons "Place order and Request offer" */
-table.shopping_cart div.button {
- float: right;
- margin: 7px 0 0 10px;
-}
-
-table.shopping_cart form {
- margin: 0;
- padding: 0; /* Necessary for IE */
-}
-
-/* No padding-right for buttons in shopping cart */
-table.shopping_cart th.buttons,th.buttons {
- text-align: right;
- padding-right: 0px;
-}
-
-/* Icon for opening additional info */
-img.additional_info_icon {
- width: 16px;
- height: 16px;
- padding: 0;
- margin: 0 0 0 4px;
- cursor: pointer;
- vertical-align: text-top;
-}
-
-/* Title "Important information" */
-.additional_info_title {
- font-weight: bold;
-}
-
-/* Cells containing the additional info or the title of the info */
-td.additional_info {
- padding: 3px;
- background-color: #FFFF99;
-}
-
-/* Actual text of additional info has to be a monospace font */
-.additional_info_text {
- font-family: "Courier New", Courier, monospace;
- padding: 5px 0 0 0;
- font-weight: bold;
-}
-
-/* Additional info, if a sparepart is not available (replacement part page) */
-.additional_info_replacement {
- padding: 3px;
- background-color: #FFFF99;
- font-family: "Courier New", Courier, monospace;
- font-weight: bold;
-}
-
-/* deleted parts */
-.part_deleted {
- background-color: #FFBBBB;
-}
-
-/* Arrow in empty shopping cart pointing to the entry form */
-#arrow_left {
- height: 38px;
- padding-left: 45px;
- background: url('../../resources/images/double_left_arrow.png')
- no-repeat 3px 3px;
-}
-
-/* Difference to minimum order value */
-#order_diff th {
- background-color: #FFCCCC;
- color: #E30119;
-}
-
-#shopping_cart_buttons {
- width: 100%;
-}
-
-.float_left {
- float: left;
-}
-
-.float_right {
- float: right;
-}
-
-/*********************************************************************************
- * Filter
- */
-#filter_list {
- display: inline-block;
- float: none;
-}
-
-#filter_show label {
- vertical-align: middle;
-}
-
-#filter_show fieldset {
- padding: 5px;
-}
-
-#event_type_block {
- width: 200px;
- height: 80px;
- float: left;
-}
-
-#event_type_block select {
- width: 150px;
-}
-
-#user_id_block {
- width: 200px;
- height: 80px;
- float: left;
-}
-
-#selected_customer_block {
- width: 200px;
- height: 80px;
- float: left;
-}
-
-#date_filter_block {
- width: 220px;
- height: 80px;
- float: left;
- text-align: right;
-}
-
-#date_filter_block input {
- padding-right: 5px;
-}
-
-#filter_spacer {
- width: 10px;
- height: 80px;
-}
-
-#filter_submit {
- padding-top: 10px;
- text-align: right;
-}
-
-.event_list th {
- text-align: left;
-}
-
-.event_list td {
- padding-right: 20px;
-}
-
-.event_selection_list {
- width: 350px;
- border: 1px solid black;
- background-color: #EEEEEE;
- position: absolute;
-}
-
-.event_selection_list_item {
- padding: 2px;
- cursor: pointer;
-}
-
-.event_selection_list_item:hover,.event_selection_list_item_hover {
- background-color: black;
- color: white;
- padding: 2px;
- cursor: pointer;
-}
-
-.pager {
- padding-top: 20px;
- text-align: center;
-}
-
-.pager span {
- padding: 5px;
-}
\ No newline at end of file
/trunk/WebContent/resources/css/main.css
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/WebContent/resources/icons/page_white_edit.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/WebContent/resources/icons/page_white_edit.png
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: trunk/WebContent/resources/icons/delete.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/WebContent/resources/icons/delete.png
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: trunk/WebContent/resources/icons/printer.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/WebContent/resources/icons/printer.png
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: trunk/WebContent/resources/icons/add.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/WebContent/resources/icons/add.png
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: trunk/WebContent/resources/icons/error.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/WebContent/resources/icons/error.png
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: trunk/WebContent/resources/icons/tick.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/WebContent/resources/icons/tick.png
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: trunk/WebContent/resources/icons/user_comment.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/WebContent/resources/icons/user_comment.png
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: trunk/WebContent/resources
===================================================================
--- trunk/WebContent/resources (revision 38)
+++ trunk/WebContent/resources (nonexistent)
/trunk/WebContent/resources
Property changes:
Deleted: svn:ignore
## -1,7 +0,0 ##
-icons_downloaded
-
-readme.html
-
-readme.txt
-
-famfamfam_silk_icons_v013.zip
Index: trunk/WebContent/user/relationships.jsp
===================================================================
--- trunk/WebContent/user/relationships.jsp (revision 38)
+++ trunk/WebContent/user/relationships.jsp (nonexistent)
@@ -1,129 +0,0 @@
-<%@taglib uri="/struts-tags" prefix="s"%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<c:set var="contextPath" value="${pageContext.request.contextPath}" />
-
-<html>
- <head>
- <s:if test="edit">
- <title>Beziehung bearbeiten</title>
- </s:if>
- <s:else>
- <title>Beziehungen anzeigen/bearbeiten</title>
- </s:else>
- </head>
- <body>
-
- <s:if test="edit">
- <h1>Beziehung bearbeiten</h1>
- </s:if>
- <s:else>
- <h1>Beziehungen anzeigen/bearbeiten</h1>
- </s:else>
-
- <s:if test="added">
- <p>
- Die Beziehung <b>&quot;<s:text name="modifiedRelationship.termFrom.name"/>&quot;
- &quot;<s:text name="modifiedRelationship.relationshipType.nameFrom"/>&quot;
- &quot;<s:text name="modifiedRelationship.termTo.name"/>&quot;</b>
- wurde hinzugef&uuml;gt.
- </p>
- </s:if>
-
- <s:if test="terms.size() == 0">
- <p>Bitte definieren Sie zuerst mindestens einen
- <s:url id="termURL" action="listTerms" />
- <s:a href="%{termURL}">Begriff</s:a>.</p>
- </s:if>
- <s:else>
- <s:if test="edit">
- <h2>Diese Beziehung</h2>
- </s:if>
- <s:else>
- <h2>Neue Beziehung</h2>
- </s:else>
-
- <s:form action="saveRelationship">
- <s:hidden name="edit" />
- <s:hidden name="relationship.objectId" />
- <s:select name="term1" list="terms" listKey="objectId" listValue="name"
- label="Begriff 1" value="relationship.termFrom.objectId" />
- <s:select name="type" list="relationshipTypes" listKey="id" listValue="nameFrom"
- label="Beziehungstyp" value="relationship.relationshipType.id"/>
- <s:select name="term2" list="terms" listKey="objectId" listValue="name"
- label="Begriff 2" value="relationship.termTo.objectId"/>
- <s:textarea name="comment" label="Aenderungskommentar (optional)" />
- <s:if test="edit">
- <s:submit type="button"><img src="${contextPath}/resources/icons/tick.png" alt="" />
- &Auml;nderungen speichern</s:submit>
- </s:if>
- <s:else>
- <s:submit type="button"><img src="${contextPath}/resources/icons/add.png" alt="" />
- Hinzuf&uuml;gen</s:submit>
- </s:else>
- </s:form>
- </s:else>
-
- <s:if test="edit">
- <h3>&Auml;nderungsprotokoll</h3>
- <table>
- <thead>
- <th>Datum</th>
- <th>Benutzer</th>
- <th>Aktion</th>
- <th>Neuer Wert</th>
- <th>Kommentar</th>
- </thead>
- <tbody>
- <s:iterator value="relationship.object.history" status="stat">
- <tr>
- <td><s:date name="date" format="yyyy-MM-dd hh:mm:ss" /></td>
- <td><s:property value="user.firstname" /> <s:property value="user.lastname"/></td>
- <td><s:property value="actionType.name" /></td>
- <td><s:property value="value" /></td>
- <td><s:property value="comment" /></td>
- </tr>
- </s:iterator>
- </tbody>
- </table>
- </s:if>
-
- <h2>Definierte Beziehungen</h2>
- <s:if test="relationshipList.size() == 0">
- <p>Keine Beziehungen definiert</p>
- </s:if>
- <s:else>
- <table>
- <thead>
- <th>Begriff 1</th>
- <th>Beziehungstyp</th>
- <th>Begriff 2</th>
- </thead>
- <tbody>
- <s:iterator value="relationshipList" status="stat">
- <tr>
- <td><s:url id="term1URL" action="editTerm">
- <s:param name="id" value="%{termFrom.objectId}"></s:param>
- </s:url><s:a href="%{term1URL}"><s:property value="termFrom.name" /></s:a></td>
- <td><s:property value="relationshipType.nameFrom" /></td>
- <td><s:url id="term2URL" action="editTerm">
- <s:param name="id" value="%{termTo.objectId}"></s:param>
- </s:url><s:a href="%{term2URL}"><s:property value="termTo.name" /></s:a></td>
-
- <td><s:url id="editURL" action="editRelationship">
- <s:param name="id" value="%{objectId}"></s:param>
- </s:url><s:a href="%{editURL}"><img
- src="${contextPath}/resources/icons/page_white_edit.png"
- alt="Bearbeiten" title="Bearbeiten" /></s:a></td>
-
- <td><s:url id="deleteURL" action="deleteRelationship">
- <s:param name="id" value="%{objectId}"></s:param>
- </s:url><s:a href="%{deleteURL}" onclick="return window.confirm('Beziehung loeschen?')"><img
- src="${contextPath}/resources/icons/delete.png"
- alt="L&ouml;schen" title="L&ouml;schen" /></s:a></td>
- </tr>
- </s:iterator>
- </tbody>
- </table>
- </s:else>
- </body>
-</html>
\ No newline at end of file
/trunk/WebContent/user/relationships.jsp
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/WebContent/user/nav.jsp
===================================================================
--- trunk/WebContent/user/nav.jsp (revision 38)
+++ trunk/WebContent/user/nav.jsp (nonexistent)
@@ -1,15 +0,0 @@
-<div id="navigation">
- <ul>
- <li>Ontologie
- <ul>
- <li><a href="listTerms">Begriffe</a></li>
- <li><a href="listRelationships">Beziehungen</li>
- </ul></li>
-
- <li>Benutzerfunktionen
- <ul>
- <li><a href="../Logout">Abmelden</a></li>
- </ul></li>
-
- </ul>
-</div>
\ No newline at end of file
/trunk/WebContent/user/nav.jsp
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/WebContent/user/main.jsp
===================================================================
--- trunk/WebContent/user/main.jsp (revision 38)
+++ trunk/WebContent/user/main.jsp (nonexistent)
@@ -1,12 +0,0 @@
-<html>
-<head>
-<title>Startseite Benutzer</title>
-</head>
-<body>
-
- <p>
- Willkommen im User-Bereich
- </p>
-
-</body>
-</html>
/trunk/WebContent/user/main.jsp
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/WebContent/user/userAdd.jsp
===================================================================
--- trunk/WebContent/user/userAdd.jsp (revision 38)
+++ trunk/WebContent/user/userAdd.jsp (nonexistent)
@@ -1,17 +0,0 @@
-<html>
-<head>
-<title>User added</title>
-</head>
-<body>
-
- <h1>
- User hinzugef&uuml;gt
- </h1>
- <p>
- Der Benutzer wurde hinzugef&uuml;gt
- </p>
- <p>
- TODO: Weiterleitung!!
- </p>
-</body>
-</html>
\ No newline at end of file
/trunk/WebContent/user/userAdd.jsp
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/WebContent/user/index.jsp
===================================================================
--- trunk/WebContent/user/index.jsp (revision 38)
+++ trunk/WebContent/user/index.jsp (nonexistent)
@@ -1,21 +0,0 @@
-<%@ page errorPage="../ErrorHandler.jsp"%>
-<%@ include file="../html_head.jsp"%>
-
-<%-- Only serves as a container for the different site elements!
- Do not write any text directly into the container div! --%>
-<div id="page-container">
- <div id="header">
- <%@ include file="../header.jsp"%>
- </div>
-
- <div id="navbar">
- <%@ include file="nav.jsp"%>
- </div>
-
- <div id="content">
- <%@ include file="main.jsp"%>
- </div>
-</div>
-
-</body>
-</html>
/trunk/WebContent/user/index.jsp
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/WebContent/user/terms.jsp
===================================================================
--- trunk/WebContent/user/terms.jsp (revision 38)
+++ trunk/WebContent/user/terms.jsp (nonexistent)
@@ -1,172 +0,0 @@
-<%@taglib uri="/struts-tags" prefix="s"%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<c:set var="contextPath" value="${pageContext.request.contextPath}" />
-
-<html>
- <head>
- <s:if test="edit">
- <title>Begriff bearbeiten</title>
- </s:if>
- <s:else>
- <title>Begriffe anzeigen/bearbeiten</title>
- </s:else>
- </head>
- <body>
- <s:if test="edit">
- <h1>Begriff bearbeiten</h1>
- </s:if>
- <s:else>
- <h1>Begriffe anzeigen/bearbeiten</h1>
- </s:else>
-
- <s:if test="added">
- <p>Der Begriff <b><s:text name="savedTerm.name"/></b> wurde hinzugef&uuml;gt.</p>
- </s:if>
-
- <s:if test="edit">
- <h2>Dieser Begriff</h2>
- </s:if>
- <s:else>
- <h2>Neuer Begriff</h2>
- </s:else>
-
- <s:form action="saveTerm">
- <s:hidden name="edit" />
- <s:hidden name="term.objectId" />
- <s:textfield name="term.name" label="Name" required="true" />
- <s:textarea name="comment" label="Aenderungskommentar (optional)" />
- <s:if test="edit">
- <s:submit type="button"><img src="${contextPath}/resources/icons/tick.png" alt="" />
- Umbenennen</s:submit>
- </s:if>
- <s:else>
- <s:submit type="button"><img src="${contextPath}/resources/icons/add.png" alt="" />
- Hinzuf&uuml;gen
- </s:submit>
- </s:else>
- </s:form>
-
- <s:if test="edit">
- <h3>Beziehungen</h3>
-
- <s:if test="term.relationshipsForTermFrom.size() == 0 && term.relationshipsForTermTo.size() == 0">
- <p>Dieser Begriff steht mit keinem anderen in Beziehung.</p>
-
- </s:if>
- <s:else>
- <p>Dieser Begriff steht zur Zeit in folgenden Beziehungen:</p>
-
- <table>
- <thead>
- <th>Begriff 1</th>
- <th>Beziehungstyp</th>
- <th>Begriff 2</th>
- </thead>
- <tbody>
- <s:iterator value="term.relationshipsForTermFrom">
- <tr>
- <td><s:property value="termFrom.name" /></td>
- <td><s:property value="relationshipType.nameFrom" /></td>
- <td><s:url id="term1URL" action="editTerm">
- <s:param name="id" value="%{termTo.objectId}"></s:param>
- </s:url><s:a href="%{term1URL}"><s:property value="termTo.name" /></s:a></td>
- <td><s:url id="editURL" action="editRelationship">
- <s:param name="id" value="%{objectId}" />
- </s:url><s:a href="%{editURL}"><img
- src="${contextPath}/resources/icons/page_white_edit.png"
- alt="Bearbeiten" title="Bearbeiten" />
- </s:a></td>
-
- <td><s:url id="deleteURL" action="deleteRelationship">
- <s:param name="id" value="%{objectId}"></s:param>
- </s:url><s:a href="%{deleteURL}"
- onclick="return window.confirm('Beziehung loeschen?')"><img
- src="${contextPath}/resources/icons/delete.png"
- alt="L&ouml;schen" title="L&ouml;schen""/></s:a></td>
- </tr>
- </s:iterator>
- <s:iterator value="term.relationshipsForTermTo">
- <tr>
- <td><s:property value="termTo.name" /></td>
- <td><s:property value="relationshipType.nameTo" /></td>
- <td><s:url id="term2URL" action="editTerm">
- <s:param name="id" value="%{termFrom.objectId}" />
- </s:url><s:a href="%{term2URL}"><s:property value="termFrom.name" /></s:a></td>
- <td><s:url id="editURL" action="editRelationship">
- <s:param name="id" value="%{objectId}"></s:param>
- </s:url><s:a href="%{editURL}"><img
- src="${contextPath}/resources/icons/page_white_edit.png"
- alt="Bearbeiten" title="Bearbeiten" />
- </s:a></td>
-
- <td><s:url id="deleteURL" action="deleteRelationship">
- <s:param name="id" value="%{objectId}"></s:param>
- </s:url><s:a href="%{deleteURL}"
- onclick="return window.confirm('Beziehung loeschen?')"><img
- src="${contextPath}/resources/icons/delete.png"
- alt="L&ouml;schen" title="L&ouml;schen" /></s:a></td>
- </tr>
- </s:iterator>
- </tbody>
- </table>
- </s:else>
-
- <h3>&Auml;nderungsprotokoll</h3>
- <s:if test="term.object.history.size() == 0">
- <p>Es sind keine &Auml;nderungen f&uuml;r diesen Begriff protokolliert.</p>
- </s:if>
- <s:else>
- <table>
- <thead>
- <th>Datum</th>
- <th>Benutzer</th>
- <th>Aktion</th>
- <th>Neuer Name</th>
- <th>Kommentar</th>
- </thead>
- <tbody>
- <s:iterator value="term.object.history" status="stat">
- <tr>
- <td><s:date name="date" format="yyyy-MM-dd hh:mm:ss" /></td>
- <td><s:property value="user.firstname" /> <s:property value="user.lastname"/></td>
- <td><s:property value="actionType.name" /></td>
- <td><s:property value="value" /></td>
- <td><s:property value="comment" /></td>
- </tr>
- </s:iterator>
- </tbody>
- </table>
- </s:else>
- </s:if>
-
- <h2>Gespeicherte Begriffe</h2>
- <s:if test="termList.size() == 0">
- <p>Es wurden noch keine Begriffe eingegeben.</p>
- </s:if>
- <s:else>
- <table>
- <tbody>
- <s:iterator value="termList" status="stat">
- <s:url id="editURL" action="editTerm">
- <s:param name="id" value="%{objectId}"></s:param>
- </s:url>
- <tr>
- <td><s:a href="%{editURL}"><s:property value="name" /></s:a></td>
- <td><s:a href="%{editURL}"><img
- src="${contextPath}/resources/icons/page_white_edit.png"
- alt="Bearbeiten" title="Bearbeiten" /></s:a></td>
-
- <s:if test="false">
- <td><s:url id="deleteURL" action="deleteTerm">
- <s:param name="id" value="%{objectId}"></s:param>
- </s:url><s:a href="%{deleteURL}" onclick="return window.confirm('Begriff loeschen?')"><img
- src="${contextPath}/resources/icons/delete.png"
- alt="L&ouml;schen" title="L&ouml;schen" /></s:a></td>
- </s:if>
- </tr>
- </s:iterator>
- </tbody>
- </table>
- </s:else>
- </body>
-</html>
\ No newline at end of file
/trunk/WebContent/user/terms.jsp
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/WebContent/META-INF/MANIFEST.MF
===================================================================
--- trunk/WebContent/META-INF/MANIFEST.MF (revision 38)
+++ trunk/WebContent/META-INF/MANIFEST.MF (nonexistent)
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path:
-
/trunk/WebContent/META-INF/MANIFEST.MF
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/docs/rdm.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/docs/rdm.png
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: trunk/docs/Dokumentation.odt
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/docs/Dokumentation.odt
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: trunk/docs/rdm.mwb
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/docs/rdm.mwb
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: trunk/docs/Dokumentation.pdf
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/pdf
/trunk/docs/Dokumentation.pdf
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-application/pdf
\ No newline at end of property
Index: trunk/docs/Installationsanweisung.odt
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/docs/Installationsanweisung.odt
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: trunk/docs/Installationsanweisung.pdf
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/docs/Installationsanweisung.pdf
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: trunk/docs/mockup/begriff_erstellen.bmml
===================================================================
--- trunk/docs/mockup/begriff_erstellen.bmml (revision 38)
+++ trunk/docs/mockup/begriff_erstellen.bmml (nonexistent)
@@ -1,84 +0,0 @@
-<mockup version="1.0" skin="sketch" measuredW="1037" measuredH="565" mockupW="960" mockupH="540">
- <controls>
- <control controlID="5" controlTypeID="com.balsamiq.mockups::BrowserWindow" x="67" y="15" w="960" h="540" measuredW="450" measuredH="400" zOrder="0" locked="true" isInGroup="-1">
- <controlProperties>
- <text>Ontologie%0Ahttp%3A//ontologie.ffhs.ch/</text>
- <verticalScrollbar>false</verticalScrollbar>
- </controlProperties>
- </control>
- <control controlID="14" controlTypeID="com.balsamiq.mockups::Label" x="870" y="104" w="-1" h="-1" measuredW="135" measuredH="20" zOrder="1" locked="false" isInGroup="-1">
- <controlProperties>
- <size>10</size>
- <text>Logged%20in%20as%20michael%20%28user%29</text>
- </controlProperties>
- </control>
- <control controlID="21" controlTypeID="com.balsamiq.mockups::Label" x="353" y="124" w="-1" h="-1" measuredW="151" measuredH="29" zOrder="2" locked="false" isInGroup="-1">
- <controlProperties>
- <size>16</size>
- <text>Begriff%20hinzuf%FCgen</text>
- </controlProperties>
- </control>
- <control controlID="22" controlTypeID="com.balsamiq.mockups::Canvas" x="356" y="171" w="302" h="161" measuredW="100" measuredH="70" zOrder="3" locked="false" isInGroup="-1"/>
- <control controlID="23" controlTypeID="com.balsamiq.mockups::TextInput" x="488" y="189" w="118" h="-1" measuredW="79" measuredH="29" zOrder="4" locked="false" isInGroup="-1">
- <controlProperties>
- <text/>
- </controlProperties>
- </control>
- <control controlID="24" controlTypeID="com.balsamiq.mockups::Label" x="380" y="188" w="-1" h="-1" measuredW="39" measuredH="25" zOrder="5" locked="false" isInGroup="-1">
- <controlProperties>
- <text>Name</text>
- </controlProperties>
- </control>
- <control controlID="25" controlTypeID="com.balsamiq.mockups::Button" x="488" y="281" w="-1" h="-1" measuredW="81" measuredH="28" zOrder="6" locked="false" isInGroup="-1">
- <controlProperties>
- <text>Erstellen</text>
- </controlProperties>
- </control>
- <control controlID="26" controlTypeID="com.balsamiq.mockups::TextInput" x="488" y="233" w="118" h="-1" measuredW="79" measuredH="29" zOrder="7" locked="false" isInGroup="-1">
- <controlProperties>
- <text/>
- </controlProperties>
- </control>
- <control controlID="27" controlTypeID="com.balsamiq.mockups::Label" x="380" y="232" w="-1" h="-1" measuredW="70" measuredH="25" zOrder="8" locked="false" isInGroup="-1">
- <controlProperties>
- <text>Kommentar</text>
- </controlProperties>
- </control>
- <control controlID="29" controlTypeID="__group__" x="90" y="124" w="-1" h="-1" measuredW="140" measuredH="229" zOrder="9" locked="false" isInGroup="-1">
- <groupChildrenDescriptors>
- <control controlID="0" controlTypeID="com.balsamiq.mockups::Link" x="0" y="80" w="-1" h="-1" measuredW="118" measuredH="25" zOrder="0" locked="false" isInGroup="29">
- <controlProperties>
- <state>up</state>
- <text>Begriffe%20erstellen</text>
- </controlProperties>
- </control>
- <control controlID="1" controlTypeID="com.balsamiq.mockups::Link" x="0" y="120" w="-1" h="-1" measuredW="106" measuredH="25" zOrder="1" locked="false" isInGroup="29">
- <controlProperties>
- <text>Begriffe%20%E4ndern</text>
- </controlProperties>
- </control>
- <control controlID="2" controlTypeID="com.balsamiq.mockups::Link" x="0" y="160" w="-1" h="-1" measuredW="140" measuredH="25" zOrder="2" locked="false" isInGroup="29">
- <controlProperties>
- <text>Beziehungen%20erstellen</text>
- </controlProperties>
- </control>
- <control controlID="3" controlTypeID="com.balsamiq.mockups::Link" x="0" y="204" w="-1" h="-1" measuredW="131" measuredH="25" zOrder="3" locked="false" isInGroup="29">
- <controlProperties>
- <text>Beziehungen%20l%F6schen</text>
- </controlProperties>
- </control>
- <control controlID="4" controlTypeID="com.balsamiq.mockups::Label" x="0" y="0" w="-1" h="-1" measuredW="69" measuredH="25" zOrder="4" locked="false" isInGroup="29">
- <controlProperties>
- <text>Navigation</text>
- </controlProperties>
- </control>
- <control controlID="5" controlTypeID="com.balsamiq.mockups::Link" x="0" y="39" w="-1" h="-1" measuredW="119" measuredH="25" zOrder="5" locked="false" isInGroup="29">
- <controlProperties>
- <state>up</state>
- <text>Ontologie%20ansehen</text>
- </controlProperties>
- </control>
- </groupChildrenDescriptors>
- </control>
- </controls>
-</mockup>
\ No newline at end of file
Index: trunk/docs/mockup/history.bmml
===================================================================
--- trunk/docs/mockup/history.bmml (revision 38)
+++ trunk/docs/mockup/history.bmml (nonexistent)
@@ -1,71 +0,0 @@
-<mockup version="1.0" skin="sketch" measuredW="1030" measuredH="570" mockupW="960" mockupH="540">
- <controls>
- <control controlID="5" controlTypeID="com.balsamiq.mockups::BrowserWindow" x="60" y="20" w="960" h="540" measuredW="450" measuredH="400" zOrder="0" locked="false" isInGroup="-1">
- <controlProperties>
- <text>Ontologie%0Ahttp%3A//ontologie.ffhs.ch/</text>
- <value>0</value>
- <verticalScrollbar>false</verticalScrollbar>
- </controlProperties>
- </control>
- <control controlID="14" controlTypeID="com.balsamiq.mockups::Label" x="870" y="104" w="-1" h="-1" measuredW="135" measuredH="20" zOrder="1" locked="false" isInGroup="-1">
- <controlProperties>
- <size>10</size>
- <text>Logged%20in%20as%20michael%20%28user%29</text>
- </controlProperties>
- </control>
- <control controlID="16" controlTypeID="com.balsamiq.mockups::Link" x="75" y="169" w="-1" h="-1" measuredW="118" measuredH="25" zOrder="2" locked="true" isInGroup="-1">
- <controlProperties>
- <state>up</state>
- <text>Begriffe%20erstellen</text>
- </controlProperties>
- </control>
- <control controlID="17" controlTypeID="com.balsamiq.mockups::Link" x="75" y="209" w="-1" h="-1" measuredW="106" measuredH="25" zOrder="3" locked="true" isInGroup="-1">
- <controlProperties>
- <text>Begriffe%20%E4ndern</text>
- </controlProperties>
- </control>
- <control controlID="18" controlTypeID="com.balsamiq.mockups::Link" x="75" y="249" w="-1" h="-1" measuredW="140" measuredH="25" zOrder="4" locked="true" isInGroup="-1">
- <controlProperties>
- <text>Beziehungen%20erstellen</text>
- </controlProperties>
- </control>
- <control controlID="19" controlTypeID="com.balsamiq.mockups::Link" x="75" y="296" w="-1" h="-1" measuredW="128" measuredH="25" zOrder="5" locked="true" isInGroup="-1">
- <controlProperties>
- <text>Beziehungen%20%E4ndern</text>
- </controlProperties>
- </control>
- <control controlID="20" controlTypeID="com.balsamiq.mockups::Label" x="75" y="124" w="-1" h="-1" measuredW="69" measuredH="25" zOrder="6" locked="true" isInGroup="-1">
- <controlProperties>
- <text>Navigation</text>
- </controlProperties>
- </control>
- <control controlID="21" controlTypeID="com.balsamiq.mockups::Label" x="316" y="120" w="-1" h="-1" measuredW="156" measuredH="29" zOrder="7" locked="false" isInGroup="-1">
- <controlProperties>
- <size>16</size>
- <text>History%20f%FCr%20Begriff</text>
- </controlProperties>
- </control>
- <control controlID="22" controlTypeID="com.balsamiq.mockups::Canvas" x="316" y="164" w="510" h="366" measuredW="100" measuredH="70" zOrder="8" locked="false" isInGroup="-1"/>
- <control controlID="39" controlTypeID="com.balsamiq.mockups::Paragraph" x="335" y="209" w="410" h="47" measuredW="200" measuredH="140" zOrder="9" locked="false" isInGroup="-1">
- <controlProperties>
- <text>Der%20Begriff%20steht%20zur%20Zeit%20mit%20folgenden%20W%F6rtern%20in%20%0Aeiner%20Beziehung%3A</text>
- </controlProperties>
- </control>
- <control controlID="41" controlTypeID="com.balsamiq.mockups::Label" x="335" y="175" w="-1" h="-1" measuredW="72" measuredH="25" zOrder="10" locked="false" isInGroup="-1">
- <controlProperties>
- <color>13369344</color>
- <text>%22Beisitzer%22</text>
- </controlProperties>
- </control>
- <control controlID="45" controlTypeID="com.balsamiq.mockups::Label" x="464" y="311" w="-1" h="-1" measuredW="60" measuredH="25" zOrder="11" locked="false" isInGroup="-1">
- <controlProperties>
- <text>Negation</text>
- </controlProperties>
- </control>
- <control controlID="46" controlTypeID="com.balsamiq.mockups::DataGrid" x="345" y="256" w="-1" h="-1" measuredW="443" measuredH="148" zOrder="12" locked="false" isInGroup="-1">
- <controlProperties>
- <text>Datum%2C%20Name%2C%20Kommentar%2C%20Person%0A12.10.10%2C%20Beisitzer%2C%20-%20%2C%20michael%0A10.10.10%2C%20Beisitzerr%2C%20-%20%2C%20michael%0A8.10.10%2C%20Beisitzerr%2C%20Synonym%20%27Zuschauer%27%20hinzugef%FCgt%2C%20thomas%0A6.10.10%2C%20Beisitzerr%2C%20Begriff%20erstellt%2C%20hansli</text>
- </controlProperties>
- </control>
- </controls>
-</mockup>
\ No newline at end of file
Index: trunk/docs/mockup/begriff_bearbeiten.bmml
===================================================================
--- trunk/docs/mockup/begriff_bearbeiten.bmml (revision 38)
+++ trunk/docs/mockup/begriff_bearbeiten.bmml (nonexistent)
@@ -1,96 +0,0 @@
-<mockup version="1.0" skin="sketch" measuredW="1030" measuredH="570" mockupW="960" mockupH="540">
- <controls>
- <control controlID="5" controlTypeID="com.balsamiq.mockups::BrowserWindow" x="60" y="20" w="960" h="540" measuredW="450" measuredH="400" zOrder="0" locked="false" isInGroup="-1">
- <controlProperties>
- <text>Ontologie%0Ahttp%3A//ontologie.ffhs.ch/</text>
- <value>0</value>
- <verticalScrollbar>false</verticalScrollbar>
- </controlProperties>
- </control>
- <control controlID="14" controlTypeID="com.balsamiq.mockups::Label" x="870" y="104" w="-1" h="-1" measuredW="135" measuredH="20" zOrder="1" locked="false" isInGroup="-1">
- <controlProperties>
- <size>10</size>
- <text>Logged%20in%20as%20michael%20%28user%29</text>
- </controlProperties>
- </control>
- <control controlID="16" controlTypeID="com.balsamiq.mockups::Link" x="75" y="169" w="-1" h="-1" measuredW="118" measuredH="25" zOrder="2" locked="true" isInGroup="-1">
- <controlProperties>
- <state>up</state>
- <text>Begriffe%20erstellen</text>
- </controlProperties>
- </control>
- <control controlID="17" controlTypeID="com.balsamiq.mockups::Link" x="75" y="209" w="-1" h="-1" measuredW="106" measuredH="25" zOrder="3" locked="true" isInGroup="-1">
- <controlProperties>
- <text>Begriffe%20%E4ndern</text>
- </controlProperties>
- </control>
- <control controlID="18" controlTypeID="com.balsamiq.mockups::Link" x="75" y="249" w="-1" h="-1" measuredW="140" measuredH="25" zOrder="4" locked="true" isInGroup="-1">
- <controlProperties>
- <text>Beziehungen%20erstellen</text>
- </controlProperties>
- </control>
- <control controlID="19" controlTypeID="com.balsamiq.mockups::Link" x="75" y="296" w="-1" h="-1" measuredW="128" measuredH="25" zOrder="5" locked="true" isInGroup="-1">
- <controlProperties>
- <text>Beziehungen%20%E4ndern</text>
- </controlProperties>
- </control>
- <control controlID="20" controlTypeID="com.balsamiq.mockups::Label" x="75" y="124" w="-1" h="-1" measuredW="69" measuredH="25" zOrder="6" locked="true" isInGroup="-1">
- <controlProperties>
- <text>Navigation</text>
- </controlProperties>
- </control>
- <control controlID="21" controlTypeID="com.balsamiq.mockups::Label" x="316" y="120" w="-1" h="-1" measuredW="164" measuredH="29" zOrder="7" locked="false" isInGroup="-1">
- <controlProperties>
- <size>16</size>
- <text>Begriff%20bearbeiten%3A%20</text>
- </controlProperties>
- </control>
- <control controlID="22" controlTypeID="com.balsamiq.mockups::Canvas" x="316" y="150" w="510" h="366" measuredW="100" measuredH="70" zOrder="8" locked="false" isInGroup="-1"/>
- <control controlID="39" controlTypeID="com.balsamiq.mockups::Paragraph" x="335" y="209" w="410" h="47" measuredW="200" measuredH="140" zOrder="12" locked="false" isInGroup="-1">
- <controlProperties>
- <text>Der%20Begriff%20steht%20zur%20Zeit%20mit%20folgenden%20W%F6rtern%20in%20%0Aeiner%20Beziehung%3A</text>
- </controlProperties>
- </control>
- <control controlID="41" controlTypeID="com.balsamiq.mockups::Label" x="335" y="175" w="-1" h="-1" measuredW="72" measuredH="25" zOrder="13" locked="false" isInGroup="-1">
- <controlProperties>
- <color>13369344</color>
- <text>%22Beisitzer%22</text>
- </controlProperties>
- </control>
- <control controlID="45" controlTypeID="com.balsamiq.mockups::Label" x="464" y="311" w="-1" h="-1" measuredW="60" measuredH="25" zOrder="14" locked="false" isInGroup="-1">
- <controlProperties>
- <text>Negation</text>
- </controlProperties>
- </control>
- <control controlID="46" controlTypeID="com.balsamiq.mockups::DataGrid" x="345" y="256" w="-1" h="-1" measuredW="245" measuredH="118" zOrder="15" locked="false" isInGroup="-1">
- <controlProperties>
- <text>Begriff%2C%20Definition%2C%20Aktion%0ALorem%20ipsum%2C%20Negation%2C%20L%F6schen%0Amukugas%2C%20Aggregation%2C%20L%F6schen%0Axyz%2C%20Aggregation%2C%20L%F6schen</text>
- </controlProperties>
- </control>
- <control controlID="47" controlTypeID="com.balsamiq.mockups::Label" x="335" y="407" w="-1" h="-1" measuredW="105" measuredH="25" zOrder="16" locked="false" isInGroup="-1">
- <controlProperties>
- <text>Neue%20Beziehung</text>
- </controlProperties>
- </control>
- <control controlID="48" controlTypeID="com.balsamiq.mockups::TextInput" x="441" y="437" w="116" h="-1" measuredW="38" measuredH="29" zOrder="9" locked="false" isInGroup="-1">
- <controlProperties>
- <text>beis</text>
- </controlProperties>
- </control>
- <control controlID="49" controlTypeID="com.balsamiq.mockups::Label" x="335" y="436" w="-1" h="-1" measuredW="91" measuredH="25" zOrder="10" locked="false" isInGroup="-1">
- <controlProperties>
- <text>Suchkriterium</text>
- </controlProperties>
- </control>
- <control controlID="50" controlTypeID="com.balsamiq.mockups::Button" x="673" y="437" w="-1" h="-1" measuredW="83" measuredH="28" zOrder="11" locked="false" isInGroup="-1">
- <controlProperties>
- <text>Eintragen</text>
- </controlProperties>
- </control>
- <control controlID="51" controlTypeID="com.balsamiq.mockups::ComboBox" x="566" y="442" w="-1" h="-1" measuredW="107" measuredH="54" zOrder="17" locked="false" isInGroup="-1">
- <controlProperties>
- <text>Aggregation%0ANegation</text>
- </controlProperties>
- </control>
- </controls>
-</mockup>
\ No newline at end of file
Index: trunk/docs/mockup/begriffsuebersicht.bmml
===================================================================
--- trunk/docs/mockup/begriffsuebersicht.bmml (revision 38)
+++ trunk/docs/mockup/begriffsuebersicht.bmml (nonexistent)
@@ -1,202 +0,0 @@
-<mockup version="1.0" skin="sketch" measuredW="1030" measuredH="570" mockupW="960" mockupH="540">
- <controls>
- <control controlID="5" controlTypeID="com.balsamiq.mockups::BrowserWindow" x="60" y="20" w="960" h="540" measuredW="450" measuredH="400" zOrder="0" locked="false" isInGroup="-1">
- <controlProperties>
- <text>Ontologie%0Ahttp%3A//ontologie.ffhs.ch/</text>
- <value>0</value>
- <verticalScrollbar>false</verticalScrollbar>
- </controlProperties>
- </control>
- <control controlID="14" controlTypeID="com.balsamiq.mockups::Label" x="870" y="104" w="-1" h="-1" measuredW="135" measuredH="20" zOrder="1" locked="false" isInGroup="-1">
- <controlProperties>
- <size>10</size>
- <text>Logged%20in%20as%20michael%20%28user%29</text>
- </controlProperties>
- </control>
- <control controlID="16" controlTypeID="com.balsamiq.mockups::Link" x="75" y="169" w="-1" h="-1" measuredW="118" measuredH="25" zOrder="2" locked="true" isInGroup="-1">
- <controlProperties>
- <state>up</state>
- <text>Begriffe%20erstellen</text>
- </controlProperties>
- </control>
- <control controlID="17" controlTypeID="com.balsamiq.mockups::Link" x="75" y="209" w="-1" h="-1" measuredW="106" measuredH="25" zOrder="3" locked="true" isInGroup="-1">
- <controlProperties>
- <text>Begriffe%20%E4ndern</text>
- </controlProperties>
- </control>
- <control controlID="18" controlTypeID="com.balsamiq.mockups::Link" x="75" y="249" w="-1" h="-1" measuredW="140" measuredH="25" zOrder="4" locked="true" isInGroup="-1">
- <controlProperties>
- <text>Beziehungen%20erstellen</text>
- </controlProperties>
- </control>
- <control controlID="19" controlTypeID="com.balsamiq.mockups::Link" x="75" y="296" w="-1" h="-1" measuredW="128" measuredH="25" zOrder="5" locked="true" isInGroup="-1">
- <controlProperties>
- <text>Beziehungen%20%E4ndern</text>
- </controlProperties>
- </control>
- <control controlID="20" controlTypeID="com.balsamiq.mockups::Label" x="75" y="124" w="-1" h="-1" measuredW="69" measuredH="25" zOrder="6" locked="true" isInGroup="-1">
- <controlProperties>
- <text>Navigation</text>
- </controlProperties>
- </control>
- <control controlID="21" controlTypeID="com.balsamiq.mockups::Label" x="316" y="120" w="-1" h="-1" measuredW="142" measuredH="29" zOrder="7" locked="false" isInGroup="-1">
- <controlProperties>
- <size>16</size>
- <text>Begriffs%FCbersicht</text>
- </controlProperties>
- </control>
- <control controlID="22" controlTypeID="com.balsamiq.mockups::Canvas" x="319" y="156" w="486" h="366" measuredW="100" measuredH="70" zOrder="8" locked="false" isInGroup="-1">
- <controlProperties>
- <verticalScrollbar>false</verticalScrollbar>
- </controlProperties>
- </control>
- <control controlID="39" controlTypeID="com.balsamiq.mockups::Paragraph" x="339" y="174" w="422" h="47" measuredW="200" measuredH="140" zOrder="10" locked="false" isInGroup="-1">
- <controlProperties>
- <text>Suchen%20Sie%20den%20Begriff%2C%20den%20Sie%20bearbeiten%20m%F6chten.%20%0ADann%20klicken%20Sie%20auf%20das%20Icon%20zum%20Editieren%20/%20L%F6schen%20/%20History</text>
- </controlProperties>
- </control>
- <control controlID="40" controlTypeID="__group__" x="339" y="233" w="-1" h="-1" measuredW="305" measuredH="31" zOrder="9" locked="false" isInGroup="-1">
- <groupChildrenDescriptors>
- <control controlID="0" controlTypeID="com.balsamiq.mockups::TextInput" x="106" y="1" w="116" h="-1" measuredW="38" measuredH="29" zOrder="0" locked="false" isInGroup="40">
- <controlProperties>
- <text>beis</text>
- </controlProperties>
- </control>
- <control controlID="1" controlTypeID="com.balsamiq.mockups::Label" x="0" y="0" w="-1" h="-1" measuredW="91" measuredH="25" zOrder="1" locked="false" isInGroup="40">
- <controlProperties>
- <text>Suchkriterium</text>
- </controlProperties>
- </control>
- <control controlID="2" controlTypeID="com.balsamiq.mockups::Button" x="238" y="3" w="-1" h="-1" measuredW="67" measuredH="28" zOrder="2" locked="false" isInGroup="40">
- <controlProperties>
- <text>Suchen</text>
- </controlProperties>
- </control>
- </groupChildrenDescriptors>
- </control>
- <control controlID="46" controlTypeID="__group__" x="445" y="276" w="-1" h="-1" measuredW="217" measuredH="125" zOrder="11" locked="false" isInGroup="-1">
- <groupChildrenDescriptors>
- <control controlID="0" controlTypeID="__group__" x="0" y="0" w="-1" h="-1" measuredW="189" measuredH="25" zOrder="0" locked="false" isInGroup="46">
- <groupChildrenDescriptors>
- <control controlID="0" controlTypeID="com.balsamiq.mockups::Icon" x="141" y="1" w="-1" h="-1" measuredW="24" measuredH="24" zOrder="0" locked="false" isInGroup="0">
- <controlProperties>
- <icon>TrashIcon%7Csmall</icon>
- </controlProperties>
- </control>
- <control controlID="1" controlTypeID="com.balsamiq.mockups::Icon" x="165" y="1" w="-1" h="-1" measuredW="24" measuredH="24" zOrder="1" locked="false" isInGroup="0">
- <controlProperties>
- <icon>PencilIcon%7Csmall</icon>
- </controlProperties>
- </control>
- <control controlID="2" controlTypeID="com.balsamiq.mockups::Label" x="0" y="0" w="-1" h="-1" measuredW="96" measuredH="25" zOrder="2" locked="false" isInGroup="0">
- <controlProperties>
- <text>Beispieleintrag</text>
- </controlProperties>
- </control>
- </groupChildrenDescriptors>
- </control>
- <control controlID="1" controlTypeID="__group__" x="0" y="25" w="189" h="50" measuredW="189" measuredH="50" zOrder="1" locked="false" isInGroup="46">
- <groupChildrenDescriptors>
- <control controlID="0" controlTypeID="com.balsamiq.mockups::Icon" x="141" y="1" w="-1" h="-1" measuredW="24" measuredH="24" zOrder="0" locked="false" isInGroup="1">
- <controlProperties>
- <icon>TrashIcon%7Csmall</icon>
- </controlProperties>
- </control>
- <control controlID="1" controlTypeID="com.balsamiq.mockups::Icon" x="165" y="1" w="-1" h="-1" measuredW="24" measuredH="24" zOrder="1" locked="false" isInGroup="1">
- <controlProperties>
- <icon>PencilIcon%7Csmall</icon>
- </controlProperties>
- </control>
- <control controlID="2" controlTypeID="com.balsamiq.mockups::Label" x="0" y="0" w="96" h="25" measuredW="76" measuredH="25" zOrder="2" locked="false" isInGroup="1">
- <controlProperties>
- <text>Beispielding</text>
- </controlProperties>
- </control>
- <control controlID="3" controlTypeID="__group__" x="0" y="25" w="-1" h="-1" measuredW="189" measuredH="25" zOrder="3" locked="false" isInGroup="1">
- <groupChildrenDescriptors>
- <control controlID="0" controlTypeID="com.balsamiq.mockups::Icon" x="141" y="1" w="-1" h="-1" measuredW="24" measuredH="24" zOrder="0" locked="false" isInGroup="3">
- <controlProperties>
- <icon>TrashIcon%7Csmall</icon>
- </controlProperties>
- </control>
- <control controlID="1" controlTypeID="com.balsamiq.mockups::Icon" x="165" y="1" w="-1" h="-1" measuredW="24" measuredH="24" zOrder="1" locked="false" isInGroup="3">
- <controlProperties>
- <icon>PencilIcon%7Csmall</icon>
- </controlProperties>
- </control>
- <control controlID="2" controlTypeID="com.balsamiq.mockups::Label" x="0" y="0" w="-1" h="-1" measuredW="61" measuredH="25" zOrder="2" locked="false" isInGroup="3">
- <controlProperties>
- <text>Beisitzer</text>
- </controlProperties>
- </control>
- </groupChildrenDescriptors>
- </control>
- </groupChildrenDescriptors>
- </control>
- <control controlID="2" controlTypeID="__group__" x="0" y="75" w="189" h="50" measuredW="189" measuredH="50" zOrder="2" locked="false" isInGroup="46">
- <groupChildrenDescriptors>
- <control controlID="0" controlTypeID="com.balsamiq.mockups::Icon" x="141" y="1" w="-1" h="-1" measuredW="24" measuredH="24" zOrder="0" locked="false" isInGroup="2">
- <controlProperties>
- <icon>TrashIcon%7Csmall</icon>
- </controlProperties>
- </control>
- <control controlID="1" controlTypeID="com.balsamiq.mockups::Icon" x="165" y="1" w="-1" h="-1" measuredW="24" measuredH="24" zOrder="1" locked="false" isInGroup="2">
- <controlProperties>
- <icon>PencilIcon%7Csmall</icon>
- </controlProperties>
- </control>
- <control controlID="2" controlTypeID="com.balsamiq.mockups::Label" x="0" y="0" w="96" h="25" measuredW="79" measuredH="25" zOrder="2" locked="false" isInGroup="2">
- <controlProperties>
- <text>Beispiellibus</text>
- </controlProperties>
- </control>
- <control controlID="3" controlTypeID="__group__" x="0" y="25" w="-1" h="-1" measuredW="189" measuredH="25" zOrder="3" locked="false" isInGroup="2">
- <groupChildrenDescriptors>
- <control controlID="0" controlTypeID="com.balsamiq.mockups::Icon" x="141" y="1" w="-1" h="-1" measuredW="24" measuredH="24" zOrder="0" locked="false" isInGroup="3">
- <controlProperties>
- <icon>TrashIcon%7Csmall</icon>
- </controlProperties>
- </control>
- <control controlID="1" controlTypeID="com.balsamiq.mockups::Icon" x="165" y="1" w="-1" h="-1" measuredW="24" measuredH="24" zOrder="1" locked="false" isInGroup="3">
- <controlProperties>
- <icon>PencilIcon%7Csmall</icon>
- </controlProperties>
- </control>
- <control controlID="2" controlTypeID="com.balsamiq.mockups::Label" x="0" y="0" w="-1" h="-1" measuredW="92" measuredH="25" zOrder="2" locked="false" isInGroup="3">
- <controlProperties>
- <text>Beisitzungsbla</text>
- </controlProperties>
- </control>
- </groupChildrenDescriptors>
- </control>
- </groupChildrenDescriptors>
- </control>
- <control controlID="3" controlTypeID="com.balsamiq.mockups::Icon" x="193" y="0" w="-1" h="-1" measuredW="24" measuredH="24" zOrder="3" locked="false" isInGroup="46">
- <controlProperties>
- <icon>BookIcon%7Csmall</icon>
- </controlProperties>
- </control>
- <control controlID="4" controlTypeID="com.balsamiq.mockups::Icon" x="193" y="25" w="-1" h="-1" measuredW="24" measuredH="24" zOrder="4" locked="false" isInGroup="46">
- <controlProperties>
- <icon>BookIcon%7Csmall</icon>
- </controlProperties>
- </control>
- <control controlID="5" controlTypeID="com.balsamiq.mockups::Icon" x="193" y="51" w="-1" h="-1" measuredW="24" measuredH="24" zOrder="5" locked="false" isInGroup="46">
- <controlProperties>
- <icon>BookIcon%7Csmall</icon>
- </controlProperties>
- </control>
- <control controlID="6" controlTypeID="com.balsamiq.mockups::Icon" x="193" y="75" w="-1" h="-1" measuredW="24" measuredH="24" zOrder="6" locked="false" isInGroup="46">
- <controlProperties>
- <icon>BookIcon%7Csmall</icon>
- </controlProperties>
- </control>
- <control controlID="7" controlTypeID="com.balsamiq.mockups::Icon" x="193" y="101" w="-1" h="-1" measuredW="24" measuredH="24" zOrder="7" locked="false" isInGroup="46">
- <controlProperties>
- <icon>BookIcon%7Csmall</icon>
- </controlProperties>
- </control>
- </groupChildrenDescriptors>
- </control>
- </controls>
-</mockup>
\ No newline at end of file
Index: trunk/docs/mockup/login.bmml
===================================================================
--- trunk/docs/mockup/login.bmml (revision 38)
+++ trunk/docs/mockup/login.bmml (nonexistent)
@@ -1,40 +0,0 @@
-<mockup version="1.0" skin="sketch" measuredW="1030" measuredH="570" mockupW="960" mockupH="540">
- <controls>
- <control controlID="5" controlTypeID="com.balsamiq.mockups::BrowserWindow" x="60" y="20" w="960" h="540" measuredW="450" measuredH="400" zOrder="0" locked="false" isInGroup="-1">
- <controlProperties>
- <text>Ontologie%0Ahttp%3A//ontologie.ffhs.ch/</text>
- <verticalScrollbar>false</verticalScrollbar>
- </controlProperties>
- </control>
- <control controlID="8" controlTypeID="com.balsamiq.mockups::Canvas" x="285" y="183" w="337" h="188" measuredW="100" measuredH="70" zOrder="1" locked="false" isInGroup="-1">
- <controlProperties>
- <color>13421772</color>
- </controlProperties>
- </control>
- <control controlID="9" controlTypeID="com.balsamiq.mockups::TextInput" x="441" y="240" w="-1" h="-1" measuredW="79" measuredH="29" zOrder="2" locked="false" isInGroup="-1">
- <controlProperties>
- <text/>
- </controlProperties>
- </control>
- <control controlID="10" controlTypeID="com.balsamiq.mockups::TextInput" x="440" y="282" w="-1" h="-1" measuredW="79" measuredH="29" zOrder="3" locked="false" isInGroup="-1">
- <controlProperties>
- <text/>
- </controlProperties>
- </control>
- <control controlID="11" controlTypeID="com.balsamiq.mockups::Label" x="323" y="240" w="-1" h="-1" measuredW="65" measuredH="25" zOrder="4" locked="false" isInGroup="-1">
- <controlProperties>
- <text>Username</text>
- </controlProperties>
- </control>
- <control controlID="12" controlTypeID="com.balsamiq.mockups::Label" x="322" y="284" w="-1" h="-1" measuredW="60" measuredH="25" zOrder="5" locked="false" isInGroup="-1">
- <controlProperties>
- <text>Password</text>
- </controlProperties>
- </control>
- <control controlID="13" controlTypeID="com.balsamiq.mockups::Button" x="465" y="326" w="-1" h="-1" measuredW="55" measuredH="28" zOrder="6" locked="false" isInGroup="-1">
- <controlProperties>
- <text>Login</text>
- </controlProperties>
- </control>
- </controls>
-</mockup>
\ No newline at end of file
Index: trunk/docs/mockup/beziehung_erstellen.bmml
===================================================================
--- trunk/docs/mockup/beziehung_erstellen.bmml (revision 38)
+++ trunk/docs/mockup/beziehung_erstellen.bmml (nonexistent)
@@ -1,74 +0,0 @@
-<mockup version="1.0" skin="sketch" measuredW="1030" measuredH="570" mockupW="960" mockupH="540">
- <controls>
- <control controlID="5" controlTypeID="com.balsamiq.mockups::BrowserWindow" x="60" y="20" w="960" h="540" measuredW="450" measuredH="400" zOrder="0" locked="false" isInGroup="-1">
- <controlProperties>
- <text>Ontologie%0Ahttp%3A//ontologie.ffhs.ch/</text>
- <verticalScrollbar>false</verticalScrollbar>
- </controlProperties>
- </control>
- <control controlID="14" controlTypeID="com.balsamiq.mockups::Label" x="870" y="104" w="-1" h="-1" measuredW="135" measuredH="20" zOrder="1" locked="false" isInGroup="-1">
- <controlProperties>
- <size>10</size>
- <text>Logged%20in%20as%20michael%20%28user%29</text>
- </controlProperties>
- </control>
- <control controlID="16" controlTypeID="com.balsamiq.mockups::Link" x="75" y="169" w="-1" h="-1" measuredW="118" measuredH="25" zOrder="2" locked="true" isInGroup="-1">
- <controlProperties>
- <state>up</state>
- <text>Begriffe%20erstellen</text>
- </controlProperties>
- </control>
- <control controlID="17" controlTypeID="com.balsamiq.mockups::Link" x="75" y="209" w="-1" h="-1" measuredW="106" measuredH="25" zOrder="3" locked="true" isInGroup="-1">
- <controlProperties>
- <text>Begriffe%20%E4ndern</text>
- </controlProperties>
- </control>
- <control controlID="18" controlTypeID="com.balsamiq.mockups::Link" x="75" y="249" w="-1" h="-1" measuredW="140" measuredH="25" zOrder="4" locked="true" isInGroup="-1">
- <controlProperties>
- <text>Beziehungen%20erstellen</text>
- </controlProperties>
- </control>
- <control controlID="19" controlTypeID="com.balsamiq.mockups::Link" x="75" y="296" w="-1" h="-1" measuredW="128" measuredH="25" zOrder="5" locked="true" isInGroup="-1">
- <controlProperties>
- <text>Beziehungen%20%E4ndern</text>
- </controlProperties>
- </control>
- <control controlID="20" controlTypeID="com.balsamiq.mockups::Label" x="75" y="124" w="-1" h="-1" measuredW="69" measuredH="25" zOrder="6" locked="true" isInGroup="-1">
- <controlProperties>
- <text>Navigation</text>
- </controlProperties>
- </control>
- <control controlID="21" controlTypeID="com.balsamiq.mockups::Label" x="316" y="120" w="-1" h="-1" measuredW="156" measuredH="29" zOrder="7" locked="false" isInGroup="-1">
- <controlProperties>
- <size>16</size>
- <text>Beziehung%20erstellen</text>
- </controlProperties>
- </control>
- <control controlID="22" controlTypeID="com.balsamiq.mockups::Canvas" x="319" y="167" w="302" h="161" measuredW="100" measuredH="70" zOrder="8" locked="false" isInGroup="-1"/>
- <control controlID="23" controlTypeID="com.balsamiq.mockups::TextInput" x="452" y="209" w="-1" h="-1" measuredW="106" measuredH="29" zOrder="9" locked="false" isInGroup="-1">
- <controlProperties>
- <text>Generalisierung</text>
- </controlProperties>
- </control>
- <control controlID="24" controlTypeID="com.balsamiq.mockups::Label" x="338" y="208" w="-1" h="-1" measuredW="108" measuredH="25" zOrder="10" locked="false" isInGroup="-1">
- <controlProperties>
- <text>Name%20ausgehend</text>
- </controlProperties>
- </control>
- <control controlID="25" controlTypeID="com.balsamiq.mockups::Button" x="452" y="295" w="81" h="25" measuredW="81" measuredH="28" zOrder="11" locked="false" isInGroup="-1">
- <controlProperties>
- <text>Erstellen</text>
- </controlProperties>
- </control>
- <control controlID="26" controlTypeID="com.balsamiq.mockups::Label" x="338" y="241" w="-1" h="-1" measuredW="105" measuredH="25" zOrder="12" locked="false" isInGroup="-1">
- <controlProperties>
- <text>Name%20eingehend</text>
- </controlProperties>
- </control>
- <control controlID="27" controlTypeID="com.balsamiq.mockups::TextInput" x="452" y="238" w="-1" h="-1" measuredW="102" measuredH="29" zOrder="13" locked="false" isInGroup="-1">
- <controlProperties>
- <text>Spezifizierung</text>
- </controlProperties>
- </control>
- </controls>
-</mockup>
\ No newline at end of file
Index: trunk/docs/Analysemodell.pdf
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/pdf
/trunk/docs/Analysemodell.pdf
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-application/pdf
\ No newline at end of property
Index: trunk/docs/Entwurfsmodell.pdf
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/docs/Entwurfsmodell.pdf
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: trunk/docs/database.txt
===================================================================
--- trunk/docs/database.txt (revision 38)
+++ trunk/docs/database.txt (nonexistent)
@@ -1,7 +0,0 @@
-Server version: MySQL 5.1.53-community
-
-Useraccount: webEngineering
-password: ontologie
-database: webengineering
-
-useraccount hat alle Rechte auf der Datenbank
\ No newline at end of file
/trunk/docs/database.txt
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/docs
===================================================================
--- trunk/docs (revision 38)
+++ trunk/docs (nonexistent)
/trunk/docs
Property changes:
Deleted: svn:ignore
## -1 +0,0 ##
-rdm first draft.png
Index: trunk/src/struts.xml
===================================================================
--- trunk/src/struts.xml (revision 38)
+++ trunk/src/struts.xml (nonexistent)
@@ -1,114 +0,0 @@
-<!DOCTYPE struts PUBLIC
-"-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
-"http://struts.apache.org/dtds/struts-2.0.dtd">
-
-<struts>
- <constant name="struts.devMode" value="true" /> <!-- activates debugging output -->
-
- <!-- User environment -->
- <package name="user" namespace="/user" extends="hibernate-default">
- <!-- Terms management -->
- <action name="listTerms" method="list"
- class="ch.ffhs.webE.action.TermAction">
- <result name="success">/user/terms.jsp</result>
- </action>
- <action name="saveTerm" method="save"
- class="ch.ffhs.webE.action.TermAction">
- <result type="redirect">/user/listTerms</result>
- </action>
- <action name="editTerm" method="edit"
- class="ch.ffhs.webE.action.TermAction">
- <result>/user/terms.jsp</result>
- </action>
- <action name="deleteTerm" method="delete"
- class="ch.ffhs.webE.action.TermAction">
- <result>/user/terms.jsp</result>
- </action>
-
- <!-- Relationships management -->
- <action name="listRelationships" method="list"
- class="ch.ffhs.webE.action.RelationshipAction">
- <result name="success">/user/relationships.jsp</result>
- </action>
- <action name="saveRelationship" method="save"
- class="ch.ffhs.webE.action.RelationshipAction">
- <result>/user/relationships.jsp</result>
- </action>
- <action name="editRelationship" method="edit"
- class="ch.ffhs.webE.action.RelationshipAction">
- <result>/user/relationships.jsp</result>
- </action>
- <action name="deleteRelationship" method="delete"
- class="ch.ffhs.webE.action.RelationshipAction">
- <result>/user/relationships.jsp</result>
- </action>
- </package>
-
- <!-- Admin environment -->
- <package name="admin" namespace="/admin" extends="hibernate-default">
-
- <!-- User management -->
- <action name="userAddForm">
- <result>/admin/userAddForm.jsp</result>
- </action>
-
- <action name="listUsers" method="list"
- class="ch.ffhs.webE.action.UserAction">
- <result name="success">/admin/users.jsp</result>
- </action>
-
- <action name="saveUser" method="save"
- class="ch.ffhs.webE.action.UserAction">
- <result type="redirect">/admin/listUsers</result>
- </action>
-
- <action name="deleteUser" method="delete"
- class="ch.ffhs.webE.action.UserAction">
- <result name="success" type="redirect">/admin/listUsers</result>
- </action>
-
- <action name="editUser" method="edit"
- class="ch.ffhs.webE.action.UserAction">
- <result name="success">/admin/users.jsp</result>
- </action>
-
- <!-- Relationship Type management -->
- <action name="listRelTypes" method="list"
- class="ch.ffhs.webE.action.RelationshipTypeAction">
- <result name="success">/admin/relTypes.jsp</result>
- </action>
-
- <action name="doRelTypeAdd" method="addOrUpdate"
- class="ch.ffhs.webE.action.RelationshipTypeAction">
- <result name="success" type="redirect">/admin/listRelTypes</result>
- </action>
-
- <action name="deleteRelType" method="delete"
- class="ch.ffhs.webE.action.RelationshipTypeAction">
- <result name="success" type="redirect">/admin/listRelTypes</result>
- </action>
-
- <action name="editRelType" method="edit"
- class="ch.ffhs.webE.action.RelationshipTypeAction">
- <result name="success">/admin/relTypes.jsp</result>
- <result name="error">/admin/adminError.jsp</result>
- </action>
-
- </package>
-
- <!-- Remaining environment of the session -->
- <package name="default" namespace="" extends="hibernate-default">
-
- <!-- Login -->
- <action name="Login" method="doLogin" class="ch.ffhs.webE.action.LoginAction">
- <result name="admin" type="redirect">/admin/main.jsp</result>
- <result name="user" type="redirect">/user/main.jsp</result>
- <result name="error" type="redirect">/index.jsp</result>
- </action>
-
- <action name="Logout" method="doLogout"
- class="ch.ffhs.webE.action.LoginAction">
- <result name="success" type="redirect">/index.jsp</result>
- </action>
- </package>
-</struts>
\ No newline at end of file
/trunk/src/struts.xml
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/MapKey.java
===================================================================
--- trunk/src/org/hibernate/annotations/MapKey.java (revision 38)
+++ trunk/src/org/hibernate/annotations/MapKey.java (nonexistent)
@@ -1,32 +0,0 @@
-//$Id: $
-package org.hibernate.annotations;
-
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.FIELD;
-import javax.persistence.Column;
-
-/**
- * Define the map key columns as an explicit column holding the map key
- * This is completly different from {@link javax.persistence.MapKey} which use an existing column
- * This annotation and {@link javax.persistence.MapKey} are mutually exclusive
- *
- * @author Emmanuel Bernard
- */
-@Target({METHOD, FIELD})
-@Retention(RUNTIME)
-public @interface MapKey {
- Column[] columns() default {};
- /**
- * Represent the key class in a Map
- * Only useful if the collection does not use generics
- */
- Class targetElement() default void.class;
-
- /**
- * The optional map key type. Guessed if default
- */
- Type type() default @Type(type = "");
-}
/trunk/src/org/hibernate/annotations/MapKey.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/Table.java
===================================================================
--- trunk/src/org/hibernate/annotations/Table.java (revision 38)
+++ trunk/src/org/hibernate/annotations/Table.java (nonexistent)
@@ -1,86 +0,0 @@
-//$Id: Table.java 11282 2007-03-14 22:05:59Z epbernard $
-package org.hibernate.annotations;
-
-import static java.lang.annotation.ElementType.TYPE;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-/**
- * Complementary information to a table either primary or secondary
- *
- * @author Emmanuel Bernard
- */
-@Target({TYPE})
-@Retention(RUNTIME)
-public @interface Table {
- /**
- * name of the targeted table
- */
- String appliesTo();
-
- /**
- * Indexes
- */
- Index[] indexes() default {};
-
- /**
- * define a table comment
- */
- String comment() default "";
-
- /**
- * Defines the Foreign Key name of a secondary table
- * pointing back to the primary table
- */
- ForeignKey foreignKey() default @ForeignKey( name="" );
-
- /**
- * If set to JOIN, the default, Hibernate will use an inner join to retrieve a
- * secondary table defined by a class or its superclasses and an outer join for a
- * secondary table defined by a subclass.
- * If set to select then Hibernate will use a
- * sequential select for a secondary table defined on a subclass, which will be issued only if a row
- * turns out to represent an instance of the subclass. Inner joins will still be used to retrieve a
- * secondary defined by the class and its superclasses.
- *
- * <b>Only applies to secondary tables</b>
- */
- FetchMode fetch() default FetchMode.JOIN;
-
- /**
- * If true, Hibernate will not try to insert or update the properties defined by this join.
- *
- * <b>Only applies to secondary tables</b>
- */
- boolean inverse() default false;
-
- /**
- * If enabled, Hibernate will insert a row only if the properties defined by this join are non-null
- * and will always use an outer join to retrieve the properties.
- *
- * <b>Only applies to secondary tables</b>
- */
- boolean optional() default true;
-
- /**
- * Defines a custom SQL insert statement
- *
- * <b>Only applies to secondary tables</b>
- */
- SQLInsert sqlInsert() default @SQLInsert(sql="");
-
- /**
- * Defines a custom SQL update statement
- *
- * <b>Only applies to secondary tables</b>
- */
- SQLUpdate sqlUpdate() default @SQLUpdate(sql="");
-
- /**
- * Defines a custom SQL delete statement
- *
- * <b>Only applies to secondary tables</b>
- */
- SQLDelete sqlDelete() default @SQLDelete(sql="");
-}
/trunk/src/org/hibernate/annotations/Table.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/FlushModeType.java
===================================================================
--- trunk/src/org/hibernate/annotations/FlushModeType.java (revision 38)
+++ trunk/src/org/hibernate/annotations/FlushModeType.java (nonexistent)
@@ -1,36 +0,0 @@
-package org.hibernate.annotations;
-
-/**
- * Enumeration extending javax.persistence flush modes.
- *
- * @author Carlos González-Cadenas
- */
-
-public enum FlushModeType {
- /**
- * see {@link org.hibernate.FlushMode.ALWAYS}
- */
- ALWAYS,
- /**
- * see {@link org.hibernate.FlushMode.AUTO}
- */
- AUTO,
- /**
- * see {@link org.hibernate.FlushMode.COMMIT}
- */
- COMMIT,
- /**
- * see {@link org.hibernate.FlushMode.NEVER}
- * @deprecated use MANUAL, will be removed in a subsequent release
- */
- NEVER,
- /**
- * see {@link org.hibernate.FlushMode.MANUAL}
- */
- MANUAL,
-
- /**
- * Current flush mode of the persistence context at the time the query is executed
- */
- PERSISTENCE_CONTEXT
-}
\ No newline at end of file
/trunk/src/org/hibernate/annotations/FlushModeType.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/SortType.java
===================================================================
--- trunk/src/org/hibernate/annotations/SortType.java (revision 38)
+++ trunk/src/org/hibernate/annotations/SortType.java (nonexistent)
@@ -1,13 +0,0 @@
-//$Id: SortType.java 11282 2007-03-14 22:05:59Z epbernard $
-package org.hibernate.annotations;
-
-/**
- * Sort strategies
- *
- * @author Emmanuel Bernard
- */
-public enum SortType {
- UNSORTED,
- NATURAL,
- COMPARATOR
-}
/trunk/src/org/hibernate/annotations/SortType.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/NamedNativeQueries.java
===================================================================
--- trunk/src/org/hibernate/annotations/NamedNativeQueries.java (revision 38)
+++ trunk/src/org/hibernate/annotations/NamedNativeQueries.java (nonexistent)
@@ -1,19 +0,0 @@
-package org.hibernate.annotations;
-
-import static java.lang.annotation.ElementType.PACKAGE;
-import static java.lang.annotation.ElementType.TYPE;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-/**
- * Extends {@link javax.persistence.NamedNativeQueries} to hold hibernate NamedNativeQuery
- * objects
- *
- * @author Emmanuel Bernard
- */
-@Target({TYPE, PACKAGE})
-@Retention(RUNTIME)
-public @interface NamedNativeQueries {
- NamedNativeQuery[] value();
-}
\ No newline at end of file
/trunk/src/org/hibernate/annotations/NamedNativeQueries.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/NotFound.java
===================================================================
--- trunk/src/org/hibernate/annotations/NotFound.java (revision 38)
+++ trunk/src/org/hibernate/annotations/NotFound.java (nonexistent)
@@ -1,18 +0,0 @@
-package org.hibernate.annotations;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-/**
- * Action to do when an element is not found on a association whiel beeing expected
- *
- * @author Emmanuel Bernard
- */
-@Target({METHOD, FIELD})
-@Retention(RUNTIME)
-public @interface NotFound {
- NotFoundAction action() default NotFoundAction.EXCEPTION;
-}
/trunk/src/org/hibernate/annotations/NotFound.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/DiscriminatorFormula.java
===================================================================
--- trunk/src/org/hibernate/annotations/DiscriminatorFormula.java (revision 38)
+++ trunk/src/org/hibernate/annotations/DiscriminatorFormula.java (nonexistent)
@@ -1,20 +0,0 @@
-//$Id: DiscriminatorFormula.java 11282 2007-03-14 22:05:59Z epbernard $
-package org.hibernate.annotations;
-
-import static java.lang.annotation.ElementType.TYPE;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-/**
- * Discriminator formula
- * To be placed at the root entity.
- *
- * @author Emmanuel Bernard
- * @see Formula
- */
-@Target({TYPE})
-@Retention(RUNTIME)
-public @interface DiscriminatorFormula {
- String value();
-}
/trunk/src/org/hibernate/annotations/DiscriminatorFormula.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/OptimisticLockType.java
===================================================================
--- trunk/src/org/hibernate/annotations/OptimisticLockType.java (revision 38)
+++ trunk/src/org/hibernate/annotations/OptimisticLockType.java (nonexistent)
@@ -1,27 +0,0 @@
-//$Id: OptimisticLockType.java 11282 2007-03-14 22:05:59Z epbernard $
-package org.hibernate.annotations;
-
-/**
- * Optimistic locking strategy
- * VERSION is the default and recommanded one
- *
- * @author Emmanuel Bernard
- */
-public enum OptimisticLockType {
- /**
- * no optimistic locking
- */
- NONE,
- /**
- * use a column version
- */
- VERSION,
- /**
- * dirty columns are compared
- */
- DIRTY,
- /**
- * all columns are compared
- */
- ALL
-}
/trunk/src/org/hibernate/annotations/OptimisticLockType.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/OnDelete.java
===================================================================
--- trunk/src/org/hibernate/annotations/OnDelete.java (revision 38)
+++ trunk/src/org/hibernate/annotations/OnDelete.java (nonexistent)
@@ -1,19 +0,0 @@
-package org.hibernate.annotations;
-
-import static java.lang.annotation.ElementType.*;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-
-/**
- * Strategy to use on collections, arrays and on joined subclasses delete
- * OnDelete of secondary tables currently not supported.
- *
- * @author Emmanuel Bernard
- */
-@Target({METHOD, FIELD, TYPE})
-@Retention(RUNTIME)
-public @interface OnDelete {
- OnDeleteAction action();
-}
/trunk/src/org/hibernate/annotations/OnDelete.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/WhereJoinTable.java
===================================================================
--- trunk/src/org/hibernate/annotations/WhereJoinTable.java (revision 38)
+++ trunk/src/org/hibernate/annotations/WhereJoinTable.java (nonexistent)
@@ -1,19 +0,0 @@
-//$Id: $
-package org.hibernate.annotations;
-
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * Where clause to add to the colleciton join table
- * The clause is written in SQL
- *
- * @author Emmanuel Bernard
- */
-@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface WhereJoinTable {
- String clause();
-}
/trunk/src/org/hibernate/annotations/WhereJoinTable.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/MapKeyManyToMany.java
===================================================================
--- trunk/src/org/hibernate/annotations/MapKeyManyToMany.java (revision 38)
+++ trunk/src/org/hibernate/annotations/MapKeyManyToMany.java (nonexistent)
@@ -1,26 +0,0 @@
-//$Id: $
-package org.hibernate.annotations;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import javax.persistence.JoinColumn;
-
-/**
- * Define the map key columns as an explicit column holding the map key
- * This is completly different from {@link javax.persistence.MapKey} which use an existing column
- * This annotation and {@link javax.persistence.MapKey} are mutually exclusive
- *
- * @author Emmanuel Bernard
- */
-@Target({ElementType.METHOD, ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface MapKeyManyToMany {
- JoinColumn[] joinColumns() default {};
- /**
- * Represent the key class in a Map
- * Only useful if the collection does not use generics
- */
- Class targetEntity() default void.class;
-}
/trunk/src/org/hibernate/annotations/MapKeyManyToMany.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/FilterDef.java
===================================================================
--- trunk/src/org/hibernate/annotations/FilterDef.java (revision 38)
+++ trunk/src/org/hibernate/annotations/FilterDef.java (nonexistent)
@@ -1,24 +0,0 @@
-//$Id: FilterDef.java 11282 2007-03-14 22:05:59Z epbernard $
-package org.hibernate.annotations;
-
-import static java.lang.annotation.ElementType.PACKAGE;
-import static java.lang.annotation.ElementType.TYPE;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-/**
- * Filter definition
- *
- * @author Matthew Inger
- * @author Emmanuel Bernard
- */
-@Target({TYPE, PACKAGE})
-@Retention(RUNTIME)
-public @interface FilterDef {
- String name();
-
- String defaultCondition() default "";
-
- ParamDef[] parameters() default {};
-}
/trunk/src/org/hibernate/annotations/FilterDef.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/Formula.java
===================================================================
--- trunk/src/org/hibernate/annotations/Formula.java (revision 38)
+++ trunk/src/org/hibernate/annotations/Formula.java (nonexistent)
@@ -1,19 +0,0 @@
-package org.hibernate.annotations;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-/**
- * Formula. To be used as a replacement for @Column in most places
- * The formula has to be a valid SQL fragment
- *
- * @author Emmanuel Bernard
- */
-@Target({METHOD, FIELD})
-@Retention(RUNTIME)
-public @interface Formula {
- String value();
-}
/trunk/src/org/hibernate/annotations/Formula.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/Loader.java
===================================================================
--- trunk/src/org/hibernate/annotations/Loader.java (revision 38)
+++ trunk/src/org/hibernate/annotations/Loader.java (nonexistent)
@@ -1,22 +0,0 @@
-package org.hibernate.annotations;
-
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-/**
- * Loader Annotation for overwriting Hibernate default FIND method
- *
- * @author László Benke
- */
-@Target( {TYPE, FIELD, METHOD} )
-@Retention( RUNTIME )
-public @interface Loader {
- /**
- * namedQuery to use for loading
- */
- String namedQuery() default "";
-}
/trunk/src/org/hibernate/annotations/Loader.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/Index.java
===================================================================
--- trunk/src/org/hibernate/annotations/Index.java (revision 38)
+++ trunk/src/org/hibernate/annotations/Index.java (nonexistent)
@@ -1,20 +0,0 @@
-package org.hibernate.annotations;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-/**
- * Define a DB index
- *
- * @author Emmanuel Bernard
- */
-@Target({FIELD, METHOD})
-@Retention(RUNTIME)
-public @interface Index {
- String name();
-
- String[] columnNames() default {};
-}
/trunk/src/org/hibernate/annotations/Index.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/Filters.java
===================================================================
--- trunk/src/org/hibernate/annotations/Filters.java (revision 38)
+++ trunk/src/org/hibernate/annotations/Filters.java (nonexistent)
@@ -1,20 +0,0 @@
-//$Id: Filters.java 11282 2007-03-14 22:05:59Z epbernard $
-package org.hibernate.annotations;
-
-import static java.lang.annotation.ElementType.*;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-/**
- * Add multiple @Filters
- *
- * @author Emmanuel Bernard
- * @author Matthew Inger
- * @author Magnus Sandberg
- */
-@Target({TYPE, METHOD, FIELD})
-@Retention(RUNTIME)
-public @interface Filters {
- Filter[] value();
-}
/trunk/src/org/hibernate/annotations/Filters.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/CacheModeType.java
===================================================================
--- trunk/src/org/hibernate/annotations/CacheModeType.java (revision 38)
+++ trunk/src/org/hibernate/annotations/CacheModeType.java (nonexistent)
@@ -1,17 +0,0 @@
-package org.hibernate.annotations;
-
-/**
- * Enumeration for the different interaction modes between the session and
- * the Level 2 Cache.
- *
- * @author Emmanuel Bernard
- * @author Carlos González-Cadenas
- */
-
-public enum CacheModeType {
- GET,
- IGNORE,
- NORMAL,
- PUT,
- REFRESH
-}
\ No newline at end of file
/trunk/src/org/hibernate/annotations/CacheModeType.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/Where.java
===================================================================
--- trunk/src/org/hibernate/annotations/Where.java (revision 38)
+++ trunk/src/org/hibernate/annotations/Where.java (nonexistent)
@@ -1,18 +0,0 @@
-package org.hibernate.annotations;
-
-import static java.lang.annotation.ElementType.*;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-/**
- * Where clause to add to the element Entity or target entity of a collection
- * The clause is written in SQL
- *
- * @author Emmanuel Bernard
- */
-@Target({TYPE, METHOD, FIELD})
-@Retention(RUNTIME)
-public @interface Where {
- String clause();
-}
/trunk/src/org/hibernate/annotations/Where.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/LazyToOneOption.java
===================================================================
--- trunk/src/org/hibernate/annotations/LazyToOneOption.java (revision 38)
+++ trunk/src/org/hibernate/annotations/LazyToOneOption.java (nonexistent)
@@ -1,23 +0,0 @@
-//$Id: $
-package org.hibernate.annotations;
-
-/**
- * Lazy options available for a ToOne association
- *
- * @author Emmanuel Bernard
- */
-public enum LazyToOneOption {
- /** eagerly load the association */
- FALSE,
- /**
- * Lazy, give back a proxy which will be loaded when the state is requested
- * This should be the prefered option
- */
- PROXY,
- /** Lazy, give back the real object loaded when a reference is requested
- * (Bytecode enhancement is mandatory for this option, fall back to PROXY
- * if the class is not enhanced)
- * This option should be avoided unless you can't afford the use of proxies
- */
- NO_PROXY
-}
/trunk/src/org/hibernate/annotations/LazyToOneOption.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/Tuplizer.java
===================================================================
--- trunk/src/org/hibernate/annotations/Tuplizer.java (revision 38)
+++ trunk/src/org/hibernate/annotations/Tuplizer.java (nonexistent)
@@ -1,21 +0,0 @@
-//$Id: $
-package org.hibernate.annotations;
-
-import java.lang.annotation.*;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-
-/**
- * Define a tuplizer for an entity or a component
- * @author Emmanuel Bernard
- */
-@java.lang.annotation.Target( {TYPE, FIELD, METHOD} )
-@Retention( RUNTIME )
-public @interface Tuplizer {
- /** tuplizer implementation */
- Class impl();
- /** either pojo, dynamic-map or dom4j÷ */
- String entityMode() default "pojo";
-}
/trunk/src/org/hibernate/annotations/Tuplizer.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/ParamDef.java
===================================================================
--- trunk/src/org/hibernate/annotations/ParamDef.java (revision 38)
+++ trunk/src/org/hibernate/annotations/ParamDef.java (nonexistent)
@@ -1,19 +0,0 @@
-//$Id: ParamDef.java 11282 2007-03-14 22:05:59Z epbernard $
-package org.hibernate.annotations;
-
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-/**
- * A parameter definition
- *
- * @author Emmanuel Bernard
- */
-@Target({})
-@Retention(RUNTIME)
-public @interface ParamDef {
- String name();
-
- String type();
-}
/trunk/src/org/hibernate/annotations/ParamDef.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/Persister.java
===================================================================
--- trunk/src/org/hibernate/annotations/Persister.java (revision 38)
+++ trunk/src/org/hibernate/annotations/Persister.java (nonexistent)
@@ -1,16 +0,0 @@
-//$Id: $
-package org.hibernate.annotations;
-
-import java.lang.annotation.*;
-
-/**
- * Specify a custom persister.
- *
- * @author Shawn Clowater
- */
-@java.lang.annotation.Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})
-@Retention( RetentionPolicy.RUNTIME )
-public @interface Persister {
- /** Custom persister */
- Class impl();
-}
/trunk/src/org/hibernate/annotations/Persister.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/Proxy.java
===================================================================
--- trunk/src/org/hibernate/annotations/Proxy.java (revision 38)
+++ trunk/src/org/hibernate/annotations/Proxy.java (nonexistent)
@@ -1,26 +0,0 @@
-//$Id: Proxy.java 11282 2007-03-14 22:05:59Z epbernard $
-package org.hibernate.annotations;
-
-import static java.lang.annotation.ElementType.TYPE;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-/**
- * Lazy and proxy configuration of a particular class
- *
- * @author Emmanuel Bernard
- */
-@Target(TYPE)
-@Retention(RUNTIME)
-public @interface Proxy {
- /**
- * Whether this class is lazy or not (default to true)
- */
- boolean lazy() default true;
-
- /**
- * Proxy class or interface used. Default entity class name.
- */
- Class proxyClass() default void.class;
-}
/trunk/src/org/hibernate/annotations/Proxy.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/FilterDefs.java
===================================================================
--- trunk/src/org/hibernate/annotations/FilterDefs.java (revision 38)
+++ trunk/src/org/hibernate/annotations/FilterDefs.java (nonexistent)
@@ -1,20 +0,0 @@
-//$Id: FilterDefs.java 11282 2007-03-14 22:05:59Z epbernard $
-package org.hibernate.annotations;
-
-import static java.lang.annotation.ElementType.PACKAGE;
-import static java.lang.annotation.ElementType.TYPE;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-/**
- * Array of filter definitions
- *
- * @author Matthew Inger
- * @author Emmanuel Bernard
- */
-@Target({PACKAGE, TYPE})
-@Retention(RUNTIME)
-public @interface FilterDefs {
- FilterDef[] value();
-}
/trunk/src/org/hibernate/annotations/FilterDefs.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/Any.java
===================================================================
--- trunk/src/org/hibernate/annotations/Any.java (revision 38)
+++ trunk/src/org/hibernate/annotations/Any.java (nonexistent)
@@ -1,45 +0,0 @@
-//$Id$
-package org.hibernate.annotations;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import javax.persistence.Column;
-import javax.persistence.FetchType;
-import static javax.persistence.FetchType.EAGER;
-
-/**
- * Define a ToOne association pointing to several entity types.
- * Matching the according entity type is doe through a metadata discriminator column
- * This kind of mapping should be only marginal.
- *
- * @author Emmanuel Bernard
- */
-@java.lang.annotation.Target({METHOD, FIELD})
-@Retention(RUNTIME)
-public @interface Any {
- /**
- * Metadata definition used.
- * If defined, should point to a @AnyMetaDef name
- * If not defined, the local (ie in the same field or property) @AnyMetaDef is used
- */
- String metaDef() default "";
-
- /**
- * Metadata discriminator column description, This column will hold the meta value corresponding to the
- * targeted entity.
- */
- Column metaColumn();
- /**
- * Defines whether the value of the field or property should be lazily loaded or must be
- * eagerly fetched. The EAGER strategy is a requirement on the persistence provider runtime
- * that the value must be eagerly fetched. The LAZY strategy is applied when bytecode
- * enhancement is used. If not specified, defaults to EAGER.
- */
- FetchType fetch() default EAGER;
- /**
- * Whether the association is optional. If set to false then a non-null relationship must always exist.
- */
- boolean optional() default true;
-}
/trunk/src/org/hibernate/annotations/Any.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/Fetch.java
===================================================================
--- trunk/src/org/hibernate/annotations/Fetch.java (revision 38)
+++ trunk/src/org/hibernate/annotations/Fetch.java (nonexistent)
@@ -1,18 +0,0 @@
-//$Id: $
-package org.hibernate.annotations;
-
-import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * Define the fetching strategy used for the given association
- *
- * @author Emmanuel Bernard
- */
-@Target({ElementType.METHOD, ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Fetch {
- FetchMode value();
-}
/trunk/src/org/hibernate/annotations/Fetch.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/LazyCollection.java
===================================================================
--- trunk/src/org/hibernate/annotations/LazyCollection.java (revision 38)
+++ trunk/src/org/hibernate/annotations/LazyCollection.java (nonexistent)
@@ -1,18 +0,0 @@
-//$Id: $
-package org.hibernate.annotations;
-
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * Define the lazy status of a collection
- *
- * @author Emmanuel Bernard
- */
-@Target({ElementType.METHOD, ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface LazyCollection {
- LazyCollectionOption value();
-}
/trunk/src/org/hibernate/annotations/LazyCollection.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/OnDeleteAction.java
===================================================================
--- trunk/src/org/hibernate/annotations/OnDeleteAction.java (revision 38)
+++ trunk/src/org/hibernate/annotations/OnDeleteAction.java (nonexistent)
@@ -1,17 +0,0 @@
-package org.hibernate.annotations;
-
-/**
- * Possible actions on deletes
- *
- * @author Emmanuel Bernard
- */
-public enum OnDeleteAction {
- /**
- * the default
- */
- NO_ACTION,
- /**
- * use cascade delete capabilities of the DD
- */
- CASCADE
-}
/trunk/src/org/hibernate/annotations/OnDeleteAction.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/Generated.java
===================================================================
--- trunk/src/org/hibernate/annotations/Generated.java (revision 38)
+++ trunk/src/org/hibernate/annotations/Generated.java (nonexistent)
@@ -1,18 +0,0 @@
-//$Id: $
-package org.hibernate.annotations;
-
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * The annotated property is generated by the database
- *
- * @author Emmanuel Bernard
- */
-@Target({ElementType.FIELD, ElementType.METHOD})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Generated {
- GenerationTime value();
-}
/trunk/src/org/hibernate/annotations/Generated.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/CacheConcurrencyStrategy.java
===================================================================
--- trunk/src/org/hibernate/annotations/CacheConcurrencyStrategy.java (revision 38)
+++ trunk/src/org/hibernate/annotations/CacheConcurrencyStrategy.java (nonexistent)
@@ -1,15 +0,0 @@
-//$Id: CacheConcurrencyStrategy.java 11282 2007-03-14 22:05:59Z epbernard $
-package org.hibernate.annotations;
-
-/**
- * Cache concurrency strategy
- *
- * @author Emmanuel Bernard
- */
-public enum CacheConcurrencyStrategy {
- NONE,
- READ_ONLY,
- NONSTRICT_READ_WRITE,
- READ_WRITE,
- TRANSACTIONAL
-}
/trunk/src/org/hibernate/annotations/CacheConcurrencyStrategy.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/SQLUpdate.java
===================================================================
--- trunk/src/org/hibernate/annotations/SQLUpdate.java (revision 38)
+++ trunk/src/org/hibernate/annotations/SQLUpdate.java (nonexistent)
@@ -1,34 +0,0 @@
-//$Id:$
-package org.hibernate.annotations;
-
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-/**
- * SqlUpdate Annotation for overwriting Hibernate default UPDATE method
- *
- * @author László Benke
- */
-@Target( {TYPE, FIELD, METHOD} )
-@Retention( RUNTIME )
-public @interface SQLUpdate {
-
- /**
- * Procedure name or UPDATE STATEMENT
- */
- String sql();
-
- /**
- * Is the statement using stored procedure or not
- */
- boolean callable() default false;
-
- /**
- * For persistence operation what style of determining results (success/failure) is to be used.
- */
- ResultCheckStyle check() default ResultCheckStyle.NONE;
-}
/trunk/src/org/hibernate/annotations/SQLUpdate.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/ForeignKey.java
===================================================================
--- trunk/src/org/hibernate/annotations/ForeignKey.java (revision 38)
+++ trunk/src/org/hibernate/annotations/ForeignKey.java (nonexistent)
@@ -1,29 +0,0 @@
-//$Id: $
-package org.hibernate.annotations;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.TYPE;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-@Target({FIELD, METHOD, TYPE})
-@Retention(RUNTIME)
-
-/**
- * Define the foreign key name
- */
-public @interface ForeignKey {
- /**
- * Name of the foreign key. Used in OneToMany, ManyToOne, and OneToOne
- * relationships. Used for the owning side in ManyToMany relationships
- */
- String name();
-
- /**
- * Used for the non-owning side of a ManyToMany relationship. Ignored
- * in other relationships
- */
- String inverseName() default "";
-}
\ No newline at end of file
/trunk/src/org/hibernate/annotations/ForeignKey.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/Cache.java
===================================================================
--- trunk/src/org/hibernate/annotations/Cache.java (revision 38)
+++ trunk/src/org/hibernate/annotations/Cache.java (nonexistent)
@@ -1,26 +0,0 @@
-//$Id: Cache.java 11282 2007-03-14 22:05:59Z epbernard $
-package org.hibernate.annotations;
-
-import static java.lang.annotation.ElementType.*;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-/**
- * Add caching strategy to a root entity or a collection
- *
- * @author Emmanuel Bernard
- */
-@Target({TYPE, METHOD, FIELD})
-@Retention(RUNTIME)
-public @interface Cache {
- /** concurrency strategy chosen */
- CacheConcurrencyStrategy usage();
- /** cache region name */
- String region() default "";
- /**
- * whether or not lazy-properties are included in the second level cache
- * default all, other value: non-lazy
- */
- String include() default "all";
-}
/trunk/src/org/hibernate/annotations/Cache.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/OrderBy.java
===================================================================
--- trunk/src/org/hibernate/annotations/OrderBy.java (revision 38)
+++ trunk/src/org/hibernate/annotations/OrderBy.java (nonexistent)
@@ -1,19 +0,0 @@
-package org.hibernate.annotations;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-/**
- * Order a collection using SQL ordering (not HQL ordering)
- *
- * @author Emmanuel Bernard
- */
-@Target({METHOD, FIELD})
-@Retention(RUNTIME)
-public @interface OrderBy {
- /** SQL orderby clause */
- String clause();
-}
/trunk/src/org/hibernate/annotations/OrderBy.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/GenericGenerators.java
===================================================================
--- trunk/src/org/hibernate/annotations/GenericGenerators.java (revision 38)
+++ trunk/src/org/hibernate/annotations/GenericGenerators.java (nonexistent)
@@ -1,21 +0,0 @@
-//$
-package org.hibernate.annotations;
-
-import static java.lang.annotation.ElementType.PACKAGE;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-/**
- * Array of generic generator definitions
- *
- * @author Paul Cowan
- */
-@Target({PACKAGE, TYPE})
-@Retention(RUNTIME)
-public @interface GenericGenerators {
- GenericGenerator[] value();
-}
-
/trunk/src/org/hibernate/annotations/GenericGenerators.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/CollectionId.java
===================================================================
--- trunk/src/org/hibernate/annotations/CollectionId.java (revision 38)
+++ trunk/src/org/hibernate/annotations/CollectionId.java (nonexistent)
@@ -1,26 +0,0 @@
-//$Id: $
-package org.hibernate.annotations;
-
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.FIELD;
-import javax.persistence.Column;
-
-/**
- * Describe an identifier column for a bag (ie an idbag)
- * EXPERIMENTAL: the structure of this annotation might slightly change (generator() mix strategy and generator
- *
- * @author Emmanuel Bernard
- */
-@Target({METHOD, FIELD})
-@Retention(RUNTIME)
-public @interface CollectionId {
- /** Collection id column(s) */
- Column[] columns();
- /** id type, type.type() must be set */
- Type type();
- /** generator name: 'identity' or a defined generator name */
- String generator();
-}
/trunk/src/org/hibernate/annotations/CollectionId.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/BatchSize.java
===================================================================
--- trunk/src/org/hibernate/annotations/BatchSize.java (revision 38)
+++ trunk/src/org/hibernate/annotations/BatchSize.java (nonexistent)
@@ -1,19 +0,0 @@
-//$Id: BatchSize.java 11282 2007-03-14 22:05:59Z epbernard $
-package org.hibernate.annotations;
-
-import static java.lang.annotation.ElementType.*;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-/**
- * Batch size for SQL loading
- *
- * @author Emmanuel Bernard
- */
-@Target({TYPE, METHOD, FIELD})
-@Retention(RUNTIME)
-public @interface BatchSize {
- /** Strictly positive integer */
- int size();
-}
/trunk/src/org/hibernate/annotations/BatchSize.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/FilterJoinTable.java
===================================================================
--- trunk/src/org/hibernate/annotations/FilterJoinTable.java (revision 38)
+++ trunk/src/org/hibernate/annotations/FilterJoinTable.java (nonexistent)
@@ -1,20 +0,0 @@
-//$Id: $
-package org.hibernate.annotations;
-
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * Add filters to a join table collection
- *
- * @author Emmanuel Bernard
- */
-@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface FilterJoinTable {
- String name();
-
- String condition() default "";
-}
/trunk/src/org/hibernate/annotations/FilterJoinTable.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/CollectionOfElements.java
===================================================================
--- trunk/src/org/hibernate/annotations/CollectionOfElements.java (revision 38)
+++ trunk/src/org/hibernate/annotations/CollectionOfElements.java (nonexistent)
@@ -1,28 +0,0 @@
-//$Id: CollectionOfElements.java 11282 2007-03-14 22:05:59Z epbernard $
-package org.hibernate.annotations;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-import javax.persistence.FetchType;
-import static javax.persistence.FetchType.LAZY;
-
-/**
- * Annotation used to mark a collection as a collection of elements or
- * a collection of embedded objects
- *
- * @author Emmanuel Bernard
- */
-@Target({METHOD, FIELD})
-@Retention(RUNTIME)
-public @interface CollectionOfElements {
- /**
- * Represent the element class in the collection
- * Only useful if the collection does not use generics
- */
- Class targetElement() default void.class;
-
- FetchType fetch() default LAZY;
-}
/trunk/src/org/hibernate/annotations/CollectionOfElements.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/AnyMetaDef.java
===================================================================
--- trunk/src/org/hibernate/annotations/AnyMetaDef.java (revision 38)
+++ trunk/src/org/hibernate/annotations/AnyMetaDef.java (nonexistent)
@@ -1,40 +0,0 @@
-//$Id$
-package org.hibernate.annotations;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PACKAGE;
-import static java.lang.annotation.ElementType.TYPE;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-/**
- * Defines @Any and @manyToAny metadata
- *
- * @author Emmanuel Bernard
- */
-@java.lang.annotation.Target( { PACKAGE, TYPE, METHOD, FIELD } )
-@Retention( RUNTIME )
-public @interface AnyMetaDef {
- /**
- * If defined, assign a global meta definition name to be used in an @Any or @ManyToAny annotation
- * If not defined, the metadata applies to the current property or field
- */
- String name() default "";
-
- /**
- * meta discriminator Hibernate type
- */
- String metaType();
-
- /**
- * Hibernate type of the id column
- * @return
- */
- String idType();
-
- /**
- * Matching discriminator values with their respective entity
- */
- MetaValue[] metaValues();
-}
/trunk/src/org/hibernate/annotations/AnyMetaDef.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/Type.java
===================================================================
--- trunk/src/org/hibernate/annotations/Type.java (revision 38)
+++ trunk/src/org/hibernate/annotations/Type.java (nonexistent)
@@ -1,21 +0,0 @@
-//$Id: Type.java 11282 2007-03-14 22:05:59Z epbernard $
-package org.hibernate.annotations;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-/**
- * hibernate type
- *
- * @author Emmanuel Bernard
- */
-@Target({FIELD, METHOD})
-@Retention(RUNTIME)
-public @interface Type {
- String type();
-
- Parameter[] parameters() default {};
-}
\ No newline at end of file
/trunk/src/org/hibernate/annotations/Type.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/GenericGenerator.java
===================================================================
--- trunk/src/org/hibernate/annotations/GenericGenerator.java (revision 38)
+++ trunk/src/org/hibernate/annotations/GenericGenerator.java (nonexistent)
@@ -1,31 +0,0 @@
-//$Id: GenericGenerator.java 11282 2007-03-14 22:05:59Z epbernard $
-package org.hibernate.annotations;
-
-import static java.lang.annotation.ElementType.*;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-/**
- * Generator annotation describing any kind of Hibernate
- * generator in a detyped manner
- *
- * @author Emmanuel Bernard
- */
-@Target({PACKAGE, TYPE, METHOD, FIELD})
-@Retention(RUNTIME)
-public @interface GenericGenerator {
- /**
- * unique generator name
- */
- String name();
- /**
- * Generator strategy either a predefined Hibernate
- * strategy or a fully qualified class name.
- */
- String strategy();
- /**
- * Optional generator parameters
- */
- Parameter[] parameters() default {};
-}
/trunk/src/org/hibernate/annotations/GenericGenerator.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/MetaValue.java
===================================================================
--- trunk/src/org/hibernate/annotations/MetaValue.java (revision 38)
+++ trunk/src/org/hibernate/annotations/MetaValue.java (nonexistent)
@@ -1,18 +0,0 @@
-//$Id$
-package org.hibernate.annotations;
-
-/**
- * Represent a discriminator value associated to a given entity type
- * @author Emmanuel Bernard
- */
-public @interface MetaValue {
- /**
- * entity type
- */
- Class targetEntity();
-
- /**
- * discriminator value stored in database
- */
- String value();
-}
/trunk/src/org/hibernate/annotations/MetaValue.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/NaturalId.java
===================================================================
--- trunk/src/org/hibernate/annotations/NaturalId.java (revision 38)
+++ trunk/src/org/hibernate/annotations/NaturalId.java (nonexistent)
@@ -1,22 +0,0 @@
-package org.hibernate.annotations;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-
-/**
- * This specifies that a property is part of the natural id of the entity.
- *
- * @author Nicol‡s Lichtmaier
- */
-@Target( { METHOD, FIELD } )
-@Retention( RUNTIME )
-public @interface NaturalId {
- /**
- * If this natural id component is mutable or not.
- */
- boolean mutable() default false;
-}
/trunk/src/org/hibernate/annotations/NaturalId.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/IndexColumn.java
===================================================================
--- trunk/src/org/hibernate/annotations/IndexColumn.java (revision 38)
+++ trunk/src/org/hibernate/annotations/IndexColumn.java (nonexistent)
@@ -1,25 +0,0 @@
-package org.hibernate.annotations;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-/**
- * Describe an index column of a List
- *
- * @author Matthew Inger
- */
-@Target({METHOD, FIELD})
-@Retention(RUNTIME)
-public @interface IndexColumn {
- /** column name */
- String name();
- /** index in DB start from base */
- int base() default 0;
- /** is the index nullable */
- boolean nullable() default true;
- /** column definition, default to an appropriate integer */
- String columnDefinition() default "";
-}
/trunk/src/org/hibernate/annotations/IndexColumn.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/Target.java
===================================================================
--- trunk/src/org/hibernate/annotations/Target.java (revision 38)
+++ trunk/src/org/hibernate/annotations/Target.java (nonexistent)
@@ -1,17 +0,0 @@
-//$Id: $
-package org.hibernate.annotations;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * Define an explicit target,a voiding reflection and generics resolving
- *
- * @author Emmanuel Bernard
- */
-@java.lang.annotation.Target({ElementType.FIELD, ElementType.METHOD})
-@Retention( RetentionPolicy.RUNTIME )
-public @interface Target {
- Class value();
-}
/trunk/src/org/hibernate/annotations/Target.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/Parent.java
===================================================================
--- trunk/src/org/hibernate/annotations/Parent.java (revision 38)
+++ trunk/src/org/hibernate/annotations/Parent.java (nonexistent)
@@ -1,18 +0,0 @@
-//$Id: $
-package org.hibernate.annotations;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-/**
- * Reference the property as a pointer back to the owner (generally the owning entity)
- *
- * @author Emmanuel Bernard
- */
-@Target({METHOD, FIELD})
-@Retention(RUNTIME)
-public @interface Parent {
-}
/trunk/src/org/hibernate/annotations/Parent.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/ResultCheckStyle.java
===================================================================
--- trunk/src/org/hibernate/annotations/ResultCheckStyle.java (revision 38)
+++ trunk/src/org/hibernate/annotations/ResultCheckStyle.java (nonexistent)
@@ -1,31 +0,0 @@
-//$Id:
-package org.hibernate.annotations;
-
-/**
- * Possible checks on Sql Insert, Delete, Update
- *
- * @author László Benke
- */
-public enum ResultCheckStyle {
- /**
- * Do not perform checking. Either user simply does not want checking, or is
- * indicating a {@link java.sql.CallableStatement} execution in which the
- * checks are being performed explicitly and failures are handled through
- * propogation of {@link java.sql.SQLException}s.
- */
- NONE,
- /**
- * Perform row-count checking. Row counts are the int values returned by both
- * {@link java.sql.PreparedStatement#executeUpdate()} and
- * {@link java.sql.Statement#executeBatch()}. These values are checked
- * against some expected count.
- */
- COUNT,
- /**
- * Essentially the same as {@link #COUNT} except that the row count actually
- * comes from an output parameter registered as part of a
- * {@link java.sql.CallableStatement}. This style explicitly prohibits
- * statement batching from being used...
- */
- PARAM
-}
/trunk/src/org/hibernate/annotations/ResultCheckStyle.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/Entity.java
===================================================================
--- trunk/src/org/hibernate/annotations/Entity.java (revision 38)
+++ trunk/src/org/hibernate/annotations/Entity.java (nonexistent)
@@ -1,31 +0,0 @@
-//$Id: Entity.java 11282 2007-03-14 22:05:59Z epbernard $
-package org.hibernate.annotations;
-
-import static java.lang.annotation.ElementType.TYPE;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-/**
- * Extends {@link javax.persistence.Entity} with Hibernate features
- *
- * @author Emmanuel Bernard
- */
-@Target(TYPE)
-@Retention(RUNTIME)
-public @interface Entity {
- /** Is this entity mutable (read only) or not */
- boolean mutable() default true;
- /** Needed column only in SQL on insert */
- boolean dynamicInsert() default false;
- /** Needed column only in SQL on update */
- boolean dynamicUpdate() default false;
- /** Do a select to retrieve the entity before any potential update */
- boolean selectBeforeUpdate() default false;
- /** polymorphism strategy for this entity */
- PolymorphismType polymorphism() default PolymorphismType.IMPLICIT;
- /** persister of this entity, default is hibernate internal one */
- String persister() default "";
- /** optimistic locking strategy */
- OptimisticLockType optimisticLock() default OptimisticLockType.VERSION;
-}
/trunk/src/org/hibernate/annotations/Entity.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/ManyToAny.java
===================================================================
--- trunk/src/org/hibernate/annotations/ManyToAny.java (revision 38)
+++ trunk/src/org/hibernate/annotations/ManyToAny.java (nonexistent)
@@ -1,41 +0,0 @@
-//$Id$
-package org.hibernate.annotations;
-
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.FIELD;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import javax.persistence.Column;
-import javax.persistence.FetchType;
-import static javax.persistence.FetchType.EAGER;
-
-/**
- * Defined a ToMany association pointing to different entity types.
- * Matching the according entity type is doe through a metadata discriminator column
- * This kind of mapping should be only marginal.
- *
- * @author Emmanuel Bernard
- */
-@java.lang.annotation.Target({METHOD, FIELD})
-@Retention(RUNTIME)
-public @interface ManyToAny {
- /**
- * Metadata definition used.
- * If defined, should point to a @AnyMetaDef name
- * If not defined, the local (ie in the same field or property) @AnyMetaDef is used
- */
- String metaDef() default "";
-
- /**
- * Metadata dicriminator column description, This column will hold the meta value corresponding to the
- * targeted entity.
- */
- Column metaColumn();
- /**
- * Defines whether the value of the field or property should be lazily loaded or must be
- * eagerly fetched. The EAGER strategy is a requirement on the persistence provider runtime
- * that the value must be eagerly fetched. The LAZY strategy is applied when bytecode
- * enhancement is used. If not specified, defaults to EAGER.
- */
- FetchType fetch() default EAGER;
-}
/trunk/src/org/hibernate/annotations/ManyToAny.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/NamedNativeQuery.java
===================================================================
--- trunk/src/org/hibernate/annotations/NamedNativeQuery.java (revision 38)
+++ trunk/src/org/hibernate/annotations/NamedNativeQuery.java (nonexistent)
@@ -1,42 +0,0 @@
-package org.hibernate.annotations;
-
-import static java.lang.annotation.ElementType.PACKAGE;
-import static java.lang.annotation.ElementType.TYPE;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-/**
- * Extends {@link javax.persistence.NamedNativeQuery} with Hibernate features
- *
- * @author Emmanuel Bernard
- */
-@Target({TYPE, PACKAGE})
-@Retention(RUNTIME)
-public @interface NamedNativeQuery {
- String name();
-
- String query();
-
- Class resultClass() default void.class;
-
- String resultSetMapping() default ""; // name of SQLResultSetMapping
- /** the flush mode for the query */
- FlushModeType flushMode() default FlushModeType.PERSISTENCE_CONTEXT;
- /** mark the query as cacheable or not */
- boolean cacheable() default false;
- /** the cache region to use */
- String cacheRegion() default "";
- /** the number of rows fetched by the JDBC Driver per roundtrip */
- int fetchSize() default -1;
- /**the query timeout in seconds*/
- int timeout() default -1;
-
- boolean callable() default false;
- /**comment added to the SQL query, useful for the DBA */
- String comment() default "";
- /**the cache mode used for this query*/
- CacheModeType cacheMode() default CacheModeType.NORMAL;
- /**marks whether the results are fetched in read-only mode or not*/
- boolean readOnly() default false;
-}
/trunk/src/org/hibernate/annotations/NamedNativeQuery.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/NamedQueries.java
===================================================================
--- trunk/src/org/hibernate/annotations/NamedQueries.java (revision 38)
+++ trunk/src/org/hibernate/annotations/NamedQueries.java (nonexistent)
@@ -1,20 +0,0 @@
-package org.hibernate.annotations;
-
-import static java.lang.annotation.ElementType.PACKAGE;
-import static java.lang.annotation.ElementType.TYPE;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-/**
- * Extends {@link javax.persistence.NamedQueries} to hold hibernate NamedQuery
- * objects
- *
- * @author Emmanuel Bernard
- * @author Carlos González-Cadenas
- */
-@Target({TYPE, PACKAGE})
-@Retention(RUNTIME)
-public @interface NamedQueries {
- NamedQuery[] value();
-}
\ No newline at end of file
/trunk/src/org/hibernate/annotations/NamedQueries.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/Cascade.java
===================================================================
--- trunk/src/org/hibernate/annotations/Cascade.java (revision 38)
+++ trunk/src/org/hibernate/annotations/Cascade.java (nonexistent)
@@ -1,16 +0,0 @@
-package org.hibernate.annotations;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-/**
- * Apply a cascade strategy on an association
- */
-@Target({METHOD, FIELD})
-@Retention(RUNTIME)
-public @interface Cascade {
- CascadeType[] value();
-}
/trunk/src/org/hibernate/annotations/Cascade.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/SQLInsert.java
===================================================================
--- trunk/src/org/hibernate/annotations/SQLInsert.java (revision 38)
+++ trunk/src/org/hibernate/annotations/SQLInsert.java (nonexistent)
@@ -1,33 +0,0 @@
-//$Id:$
-package org.hibernate.annotations;
-
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-/**
- * SqlInsert Annotation for overwriting Hibernate default INSERT INTO method
- *
- * @author László Benke
- */
-@Target( {TYPE, FIELD, METHOD} )
-@Retention( RUNTIME )
-public @interface SQLInsert {
- /**
- * Procedure name or INSERT STATEMENT
- */
- String sql();
-
- /**
- * Is the statement using stored procedure or not
- */
- boolean callable() default false;
-
- /**
- * For persistence operation what style of determining results (success/failure) is to be used.
- */
- ResultCheckStyle check() default ResultCheckStyle.NONE;
-}
/trunk/src/org/hibernate/annotations/SQLInsert.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/Filter.java
===================================================================
--- trunk/src/org/hibernate/annotations/Filter.java (revision 38)
+++ trunk/src/org/hibernate/annotations/Filter.java (nonexistent)
@@ -1,22 +0,0 @@
-//$Id: Filter.java 11282 2007-03-14 22:05:59Z epbernard $
-package org.hibernate.annotations;
-
-import static java.lang.annotation.ElementType.*;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-/**
- * Add filters to an entity or a target entity of a collection
- *
- * @author Emmanuel Bernard
- * @author Matthew Inger
- * @author Magnus Sandberg
- */
-@Target({TYPE, METHOD, FIELD})
-@Retention(RUNTIME)
-public @interface Filter {
- String name();
-
- String condition() default "";
-}
/trunk/src/org/hibernate/annotations/Filter.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/ForceDiscriminator.java
===================================================================
--- trunk/src/org/hibernate/annotations/ForceDiscriminator.java (revision 38)
+++ trunk/src/org/hibernate/annotations/ForceDiscriminator.java (nonexistent)
@@ -1,16 +0,0 @@
-//$Id: $
-package org.hibernate.annotations;
-
-import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * ForceDiscriminator flag
- * To be placed at the root entity near @DiscriminatorColumn or @DiscriminatorFormula
- *
- * @author Serg Prasolov
- */
-@Target({ElementType.TYPE}) @Retention(RetentionPolicy.RUNTIME)
-public @interface ForceDiscriminator {}
/trunk/src/org/hibernate/annotations/ForceDiscriminator.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/Sort.java
===================================================================
--- trunk/src/org/hibernate/annotations/Sort.java (revision 38)
+++ trunk/src/org/hibernate/annotations/Sort.java (nonexistent)
@@ -1,29 +0,0 @@
-//$Id: Sort.java 11282 2007-03-14 22:05:59Z epbernard $
-package org.hibernate.annotations;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-/**
- * Collection sort
- * (Java level sorting)
- *
- * @author Emmanuel Bernard
- */
-@Target({METHOD, FIELD})
-@Retention(RUNTIME)
-public @interface Sort {
- /**
- * sort type
- */
- SortType type() default SortType.UNSORTED;
- /**
- * Sort comparator implementation
- */
- //TODO find a way to use Class<Comparator>
-
- Class comparator() default void.class;
-}
/trunk/src/org/hibernate/annotations/Sort.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/NotFoundAction.java
===================================================================
--- trunk/src/org/hibernate/annotations/NotFoundAction.java (revision 38)
+++ trunk/src/org/hibernate/annotations/NotFoundAction.java (nonexistent)
@@ -1,17 +0,0 @@
-package org.hibernate.annotations;
-
-/**
- * Actoin to use when an element is not found in DB while beeing expected
- *
- * @author Emmanuel Bernard
- */
-public enum NotFoundAction {
- /**
- * raise an exception when an element is not found (default and recommended)
- */
- EXCEPTION,
- /**
- * ignore the element when not found in DB
- */
- IGNORE
-}
/trunk/src/org/hibernate/annotations/NotFoundAction.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/OptimisticLock.java
===================================================================
--- trunk/src/org/hibernate/annotations/OptimisticLock.java (revision 38)
+++ trunk/src/org/hibernate/annotations/OptimisticLock.java (nonexistent)
@@ -1,24 +0,0 @@
-//$Id: $
-package org.hibernate.annotations;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Whether or not update entity's version on property's change
- * If the annotation is not present, the property is involved in the optimistic lock srategy (default)
- *
- * @author Logi Ragnarsson
- */
-@Target( {ElementType.METHOD, ElementType.FIELD} )
-@Retention( RetentionPolicy.RUNTIME )
-public @interface OptimisticLock {
-
- /**
- * If true, the annotated property change will not trigger a version upgrade
- */
- boolean excluded();
-
-}
/trunk/src/org/hibernate/annotations/OptimisticLock.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/FetchMode.java
===================================================================
--- trunk/src/org/hibernate/annotations/FetchMode.java (revision 38)
+++ trunk/src/org/hibernate/annotations/FetchMode.java (nonexistent)
@@ -1,22 +0,0 @@
-//$Id: $
-package org.hibernate.annotations;
-
-/**
- * Fetch options on associations
- *
- * @author Emmanuel Bernard
- */
-public enum FetchMode {
- /**
- * use a select for each individual entity, collection, or join load
- */
- SELECT,
- /**
- * use an outer join to load the related entities, collections or joins
- */
- JOIN,
- /**
- * use a subselect query to load the additional collections
- */
- SUBSELECT
-}
/trunk/src/org/hibernate/annotations/FetchMode.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/AnyMetaDefs.java
===================================================================
--- trunk/src/org/hibernate/annotations/AnyMetaDefs.java (revision 38)
+++ trunk/src/org/hibernate/annotations/AnyMetaDefs.java (nonexistent)
@@ -1,21 +0,0 @@
-//$Id$
-package org.hibernate.annotations;
-
-import static java.lang.annotation.ElementType.PACKAGE;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.FIELD;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-/**
- * Defines @Any and @ManyToAny set of metadata.
- * Can be defined at the entity level or the package level
- *
- * @author Emmanuel Bernard
- */
-@java.lang.annotation.Target( { PACKAGE, TYPE } )
-@Retention( RUNTIME )
-public @interface AnyMetaDefs {
- AnyMetaDef[] value();
-}
/trunk/src/org/hibernate/annotations/AnyMetaDefs.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/FilterJoinTables.java
===================================================================
--- trunk/src/org/hibernate/annotations/FilterJoinTables.java (revision 38)
+++ trunk/src/org/hibernate/annotations/FilterJoinTables.java (nonexistent)
@@ -1,18 +0,0 @@
-//$Id: $
-package org.hibernate.annotations;
-
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * Add multiple @FilterJoinTable to a collection
- *
- * @author Emmanuel Bernard
- */
-@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface FilterJoinTables {
- FilterJoinTable[] value();
-}
/trunk/src/org/hibernate/annotations/FilterJoinTables.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/TypeDef.java
===================================================================
--- trunk/src/org/hibernate/annotations/TypeDef.java (revision 38)
+++ trunk/src/org/hibernate/annotations/TypeDef.java (nonexistent)
@@ -1,23 +0,0 @@
-//$Id: TypeDef.java 11282 2007-03-14 22:05:59Z epbernard $
-package org.hibernate.annotations;
-
-import static java.lang.annotation.ElementType.PACKAGE;
-import static java.lang.annotation.ElementType.TYPE;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-/**
- * Type definition
- *
- * @author Emmanuel Bernard
- */
-@Target({TYPE, PACKAGE})
-@Retention(RUNTIME)
-public @interface TypeDef {
- String name();
-
- Class typeClass();
-
- Parameter[] parameters() default {};
-}
/trunk/src/org/hibernate/annotations/TypeDef.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/Tuplizers.java
===================================================================
--- trunk/src/org/hibernate/annotations/Tuplizers.java (revision 38)
+++ trunk/src/org/hibernate/annotations/Tuplizers.java (nonexistent)
@@ -1,16 +0,0 @@
-//$Id: $
-package org.hibernate.annotations;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * Define a set of tuplizer for an entity or a component
- * @author Emmanuel Bernard
- */
-@java.lang.annotation.Target( {ElementType.TYPE, ElementType.FIELD, ElementType.METHOD} )
-@Retention( RetentionPolicy.RUNTIME )
-public @interface Tuplizers {
- Tuplizer[] value();
-}
/trunk/src/org/hibernate/annotations/Tuplizers.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/AccessType.java
===================================================================
--- trunk/src/org/hibernate/annotations/AccessType.java (revision 38)
+++ trunk/src/org/hibernate/annotations/AccessType.java (nonexistent)
@@ -1,18 +0,0 @@
-//$Id: AccessType.java 11282 2007-03-14 22:05:59Z epbernard $
-package org.hibernate.annotations;
-
-import static java.lang.annotation.ElementType.*;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-/**
- * Property Access type
- *
- * @author Emmanuel Bernard
- */
-@Target({TYPE, METHOD, FIELD})
-@Retention(RUNTIME)
-public @interface AccessType {
- String value();
-}
/trunk/src/org/hibernate/annotations/AccessType.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/PolymorphismType.java
===================================================================
--- trunk/src/org/hibernate/annotations/PolymorphismType.java (revision 38)
+++ trunk/src/org/hibernate/annotations/PolymorphismType.java (nonexistent)
@@ -1,18 +0,0 @@
-//$Id: PolymorphismType.java 11282 2007-03-14 22:05:59Z epbernard $
-package org.hibernate.annotations;
-
-/**
- * Type of avaliable polymorphism for a particular entity
- *
- * @author Emmanuel Bernard
- */
-public enum PolymorphismType {
- /**
- * default, this entity is retrieved if any of its super entity is asked
- */
- IMPLICIT,
- /**
- * this entity is retrived only if explicitly asked
- */
- EXPLICIT
-}
\ No newline at end of file
/trunk/src/org/hibernate/annotations/PolymorphismType.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/NamedQuery.java
===================================================================
--- trunk/src/org/hibernate/annotations/NamedQuery.java (revision 38)
+++ trunk/src/org/hibernate/annotations/NamedQuery.java (nonexistent)
@@ -1,40 +0,0 @@
-//$Id: NamedQuery.java 14392 2008-03-05 21:57:56Z epbernard $
-package org.hibernate.annotations;
-
-import static java.lang.annotation.ElementType.PACKAGE;
-import static java.lang.annotation.ElementType.TYPE;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-/**
- * Extends {@link javax.persistence.NamedQuery} with Hibernate features
- *
- * @author Carlos González-Cadenas
- */
-@Target({TYPE, PACKAGE})
-@Retention(RUNTIME)
-public @interface NamedQuery {
-
- /** the name of the NamedQuery */
- String name();
- /** the Query String for the NamedQuery */
- String query();
- /** the flush mode for the query */
- FlushModeType flushMode() default FlushModeType.PERSISTENCE_CONTEXT;
- /** mark the query as cacheable or not */
- boolean cacheable() default false;
- /** the cache region to use */
- String cacheRegion() default "";
- /** the number of rows fetched by the JDBC Driver per roundtrip */
- int fetchSize() default -1;
- /**the query timeout in seconds*/
- int timeout() default -1;
- /**comment added to the SQL query, useful for the DBA */
- String comment() default "";
- /**the cache mode used for this query*/
- CacheModeType cacheMode() default CacheModeType.NORMAL;
- /**marks whether the results are fetched in read-only mode or not*/
- boolean readOnly() default false;
-
-}
/trunk/src/org/hibernate/annotations/NamedQuery.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/Tables.java
===================================================================
--- trunk/src/org/hibernate/annotations/Tables.java (revision 38)
+++ trunk/src/org/hibernate/annotations/Tables.java (nonexistent)
@@ -1,18 +0,0 @@
-package org.hibernate.annotations;
-
-import static java.lang.annotation.ElementType.TYPE;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-/**
- * Plural of Table
- *
- * @author Emmanuel Bernard
- * @see Table
- */
-@Target({TYPE})
-@Retention(RUNTIME)
-public @interface Tables {
- Table[] value();
-}
/trunk/src/org/hibernate/annotations/Tables.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/GenerationTime.java
===================================================================
--- trunk/src/org/hibernate/annotations/GenerationTime.java (revision 38)
+++ trunk/src/org/hibernate/annotations/GenerationTime.java (nonexistent)
@@ -1,13 +0,0 @@
-//$Id: $
-package org.hibernate.annotations;
-
-/**
- * When should the generation occurs
- *
- * @author Emmanuel Bernard
- */
-public enum GenerationTime {
- NEVER,
- INSERT,
- ALWAYS
-}
/trunk/src/org/hibernate/annotations/GenerationTime.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/SQLDeleteAll.java
===================================================================
--- trunk/src/org/hibernate/annotations/SQLDeleteAll.java (revision 38)
+++ trunk/src/org/hibernate/annotations/SQLDeleteAll.java (nonexistent)
@@ -1,34 +0,0 @@
-//$Id: $
-package org.hibernate.annotations;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.TYPE;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * SqlDelete Annotation for overwriting Hibernate default DELETE ALL method
- *
- * @author László Benke
- */
-@Target( {TYPE, FIELD, METHOD} )
-@Retention( RetentionPolicy.RUNTIME )
-public @interface SQLDeleteAll {
- /**
- * Procedure name or DELETE STATEMENT
- */
- String sql();
-
- /**
- * Is the statement using stored procedure or not
- */
- boolean callable() default false;
-
- /**
- * For persistence operation what style of determining results (success/failure) is to be used.
- */
- ResultCheckStyle check() default ResultCheckStyle.NONE;
-}
/trunk/src/org/hibernate/annotations/SQLDeleteAll.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/Check.java
===================================================================
--- trunk/src/org/hibernate/annotations/Check.java (revision 38)
+++ trunk/src/org/hibernate/annotations/Check.java (nonexistent)
@@ -1,19 +0,0 @@
-//$Id: Check.java 11282 2007-03-14 22:05:59Z epbernard $
-package org.hibernate.annotations;
-
-import static java.lang.annotation.ElementType.*;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-/**
- * Arbitrary SQL check constraints which can be defined at the class,
- * property or collection level
- *
- * @author Emmanuel Bernard
- */
-@Target({TYPE, METHOD, FIELD})
-@Retention(RUNTIME)
-public @interface Check {
- String constraints();
-}
/trunk/src/org/hibernate/annotations/Check.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/Immutable.java
===================================================================
--- trunk/src/org/hibernate/annotations/Immutable.java (revision 38)
+++ trunk/src/org/hibernate/annotations/Immutable.java (nonexistent)
@@ -1,15 +0,0 @@
-//$Id: $
-package org.hibernate.annotations;
-
-import java.lang.annotation.*;
-
-/**
- * Mark an Entity or a Collection as immutable
- * No annotation means the element is mutable
- *
- * @author Emmanuel Bernard
- */
-@java.lang.annotation.Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})
-@Retention( RetentionPolicy.RUNTIME )
-public @interface Immutable {
-}
/trunk/src/org/hibernate/annotations/Immutable.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/Columns.java
===================================================================
--- trunk/src/org/hibernate/annotations/Columns.java (revision 38)
+++ trunk/src/org/hibernate/annotations/Columns.java (nonexistent)
@@ -1,20 +0,0 @@
-//$Id: Columns.java 11282 2007-03-14 22:05:59Z epbernard $
-package org.hibernate.annotations;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-import javax.persistence.Column;
-
-/**
- * Support an array of columns. Useful for component user types mappings
- *
- * @author Emmanuel Bernard
- */
-@Target({METHOD, FIELD})
-@Retention(RUNTIME)
-public @interface Columns {
- Column[] columns();
-}
/trunk/src/org/hibernate/annotations/Columns.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/Parameter.java
===================================================================
--- trunk/src/org/hibernate/annotations/Parameter.java (revision 38)
+++ trunk/src/org/hibernate/annotations/Parameter.java (nonexistent)
@@ -1,19 +0,0 @@
-//$Id: Parameter.java 11282 2007-03-14 22:05:59Z epbernard $
-package org.hibernate.annotations;
-
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-/**
- * Parameter (basically key/value pattern)
- *
- * @author Emmanuel Bernard
- */
-@Target({})
-@Retention(RUNTIME)
-public @interface Parameter {
- String name();
-
- String value();
-}
/trunk/src/org/hibernate/annotations/Parameter.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/SQLDelete.java
===================================================================
--- trunk/src/org/hibernate/annotations/SQLDelete.java (revision 38)
+++ trunk/src/org/hibernate/annotations/SQLDelete.java (nonexistent)
@@ -1,33 +0,0 @@
-//$Id:$
-package org.hibernate.annotations;
-
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-/**
- * SqlDelete Annotation for overwriting Hibernate default DELETE method
- *
- * @author László Benke
- */
-@Target( {TYPE, FIELD, METHOD} )
-@Retention( RUNTIME )
-public @interface SQLDelete {
- /**
- * Procedure name or DELETE STATEMENT
- */
- String sql();
-
- /**
- * Is the statement using stored procedure or not
- */
- boolean callable() default false;
-
- /**
- * For persistence operation what style of determining results (success/failure) is to be used.
- */
- ResultCheckStyle check() default ResultCheckStyle.NONE;
-}
/trunk/src/org/hibernate/annotations/SQLDelete.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/TypeDefs.java
===================================================================
--- trunk/src/org/hibernate/annotations/TypeDefs.java (revision 38)
+++ trunk/src/org/hibernate/annotations/TypeDefs.java (nonexistent)
@@ -1,19 +0,0 @@
-//$Id: TypeDefs.java 11282 2007-03-14 22:05:59Z epbernard $
-package org.hibernate.annotations;
-
-import static java.lang.annotation.ElementType.PACKAGE;
-import static java.lang.annotation.ElementType.TYPE;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-/**
- * Type definition array
- *
- * @author Emmanuel Bernard
- */
-@Target({TYPE, PACKAGE})
-@Retention(RUNTIME)
-public @interface TypeDefs {
- TypeDef[] value();
-}
/trunk/src/org/hibernate/annotations/TypeDefs.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/LazyToOne.java
===================================================================
--- trunk/src/org/hibernate/annotations/LazyToOne.java (revision 38)
+++ trunk/src/org/hibernate/annotations/LazyToOne.java (nonexistent)
@@ -1,19 +0,0 @@
-//$Id: $
-package org.hibernate.annotations;
-
-import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * Define the lazy status of a ToOne association
- * (ie OneToOne or ManyToOne)
- *
- * @author Emmanuel Bernard
- */
-@Target({ElementType.METHOD, ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface LazyToOne {
- LazyToOneOption value();
-}
/trunk/src/org/hibernate/annotations/LazyToOne.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/LazyCollectionOption.java
===================================================================
--- trunk/src/org/hibernate/annotations/LazyCollectionOption.java (revision 38)
+++ trunk/src/org/hibernate/annotations/LazyCollectionOption.java (nonexistent)
@@ -1,16 +0,0 @@
-//$Id: $
-package org.hibernate.annotations;
-
-/**
- * Lazy options available for a collection
- *
- * @author Emmanuel Bernard
- */
-public enum LazyCollectionOption {
- /** eagerly load it */
- FALSE,
- /** load it when the state is requested */
- TRUE,
- /** prefer extra queries over fill collection loading */
- EXTRA
-}
/trunk/src/org/hibernate/annotations/LazyCollectionOption.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/annotations/CascadeType.java
===================================================================
--- trunk/src/org/hibernate/annotations/CascadeType.java (revision 38)
+++ trunk/src/org/hibernate/annotations/CascadeType.java (nonexistent)
@@ -1,18 +0,0 @@
-package org.hibernate.annotations;
-
-/**
- * Cascade types (can override default EJB3 cascades
- */
-public enum CascadeType {
- ALL,
- PERSIST,
- MERGE,
- REMOVE,
- REFRESH,
- DELETE,
- SAVE_UPDATE,
- REPLICATE,
- DELETE_ORPHAN,
- LOCK,
- EVICT
-}
/trunk/src/org/hibernate/annotations/CascadeType.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/TransientObjectException.java
===================================================================
--- trunk/src/org/hibernate/TransientObjectException.java (revision 38)
+++ trunk/src/org/hibernate/TransientObjectException.java (nonexistent)
@@ -1,40 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat Middleware LLC.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- *
- */
-package org.hibernate;
-
-/**
- * Thrown when the user passes a transient instance to a <tt>Session</tt>
- * method that expects a persistent instance.
- *
- * @author Gavin King
- */
-
-public class TransientObjectException extends HibernateException {
-
- public TransientObjectException(String s) {
- super(s);
- }
-
-}
/trunk/src/org/hibernate/TransientObjectException.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/EmptyInterceptor.java
===================================================================
--- trunk/src/org/hibernate/EmptyInterceptor.java (revision 38)
+++ trunk/src/org/hibernate/EmptyInterceptor.java (nonexistent)
@@ -1,121 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat Middleware LLC.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- *
- */
-package org.hibernate;
-
-import java.io.Serializable;
-import java.util.Iterator;
-
-import org.hibernate.type.Type;
-
-/**
- * An interceptor that does nothing. May be used as a base class
- * for application-defined custom interceptors.
- *
- * @author Gavin King
- */
-public class EmptyInterceptor implements Interceptor, Serializable {
-
- public static final Interceptor INSTANCE = new EmptyInterceptor();
-
- protected EmptyInterceptor() {}
-
- public void onDelete(
- Object entity,
- Serializable id,
- Object[] state,
- String[] propertyNames,
- Type[] types) {}
-
- public boolean onFlushDirty(
- Object entity,
- Serializable id,
- Object[] currentState,
- Object[] previousState,
- String[] propertyNames,
- Type[] types) {
- return false;
- }
-
- public boolean onLoad(
- Object entity,
- Serializable id,
- Object[] state,
- String[] propertyNames,
- Type[] types) {
- return false;
- }
-
- public boolean onSave(
- Object entity,
- Serializable id,
- Object[] state,
- String[] propertyNames,
- Type[] types) {
- return false;
- }
-
- public void postFlush(Iterator entities) {}
- public void preFlush(Iterator entities) {}
-
- public Boolean isTransient(Object entity) {
- return null;
- }
-
- public Object instantiate(String entityName, EntityMode entityMode, Serializable id) {
- return null;
- }
-
- public int[] findDirty(Object entity,
- Serializable id,
- Object[] currentState,
- Object[] previousState,
- String[] propertyNames,
- Type[] types) {
- return null;
- }
-
- public String getEntityName(Object object) {
- return null;
- }
-
- public Object getEntity(String entityName, Serializable id) {
- return null;
- }
-
- public void afterTransactionBegin(Transaction tx) {}
- public void afterTransactionCompletion(Transaction tx) {}
- public void beforeTransactionCompletion(Transaction tx) {}
-
- public String onPrepareStatement(String sql) {
- return sql;
- }
-
- public void onCollectionRemove(Object collection, Serializable key) throws CallbackException {}
-
- public void onCollectionRecreate(Object collection, Serializable key) throws CallbackException {}
-
- public void onCollectionUpdate(Object collection, Serializable key) throws CallbackException {}
-
-}
\ No newline at end of file
/trunk/src/org/hibernate/EmptyInterceptor.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/package.html
===================================================================
--- trunk/src/org/hibernate/package.html (revision 38)
+++ trunk/src/org/hibernate/package.html (nonexistent)
@@ -1,33 +0,0 @@
-<!--
- ~ Hibernate, Relational Persistence for Idiomatic Java
- ~
- ~ Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
- ~ indicated by the @author tags or express copyright attribution
- ~ statements applied by the authors. All third-party contributions are
- ~ distributed under license by Red Hat Middleware LLC.
- ~
- ~ This copyrighted material is made available to anyone wishing to use, modify,
- ~ copy, or redistribute it subject to the terms and conditions of the GNU
- ~ Lesser General Public License, as published by the Free Software Foundation.
- ~
- ~ This program is distributed in the hope that it will be useful,
- ~ but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- ~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- ~ for more details.
- ~
- ~ You should have received a copy of the GNU Lesser General Public License
- ~ along with this distribution; if not, write to:
- ~ Free Software Foundation, Inc.
- ~ 51 Franklin Street, Fifth Floor
- ~ Boston, MA 02110-1301 USA
- ~
- -->
-
-<html>
-<head></head>
-<body>
-<p>
- This package defines the central Hibernate APIs.
-</p>
-</body>
-</html>
/trunk/src/org/hibernate/package.html
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/ReplicationMode.java
===================================================================
--- trunk/src/org/hibernate/ReplicationMode.java (revision 38)
+++ trunk/src/org/hibernate/ReplicationMode.java (nonexistent)
@@ -1,101 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat Middleware LLC.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- *
- */
-package org.hibernate;
-
-import java.io.Serializable;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.hibernate.type.VersionType;
-
-/**
- * Represents a replication strategy.
- *
- * @see Session#replicate(Object, ReplicationMode)
- * @author Gavin King
- */
-public abstract class ReplicationMode implements Serializable {
- private final String name;
- private static final Map INSTANCES = new HashMap();
-
- public ReplicationMode(String name) {
- this.name=name;
- }
- public String toString() {
- return name;
- }
- public abstract boolean shouldOverwriteCurrentVersion(Object entity, Object currentVersion, Object newVersion, VersionType versionType);
- /**
- * Throw an exception when a row already exists.
- */
- public static final ReplicationMode EXCEPTION = new ReplicationMode("EXCEPTION") {
- public boolean shouldOverwriteCurrentVersion(Object entity, Object currentVersion, Object newVersion, VersionType versionType) {
- throw new AssertionFailure("should not be called");
- }
- };
- /**
- * Ignore replicated entities when a row already exists.
- */
- public static final ReplicationMode IGNORE = new ReplicationMode("IGNORE") {
- public boolean shouldOverwriteCurrentVersion(Object entity, Object currentVersion, Object newVersion, VersionType versionType) {
- return false;
- }
- };
- /**
- * Overwrite existing rows when a row already exists.
- */
- public static final ReplicationMode OVERWRITE = new ReplicationMode("OVERWRITE") {
- public boolean shouldOverwriteCurrentVersion(Object entity, Object currentVersion, Object newVersion, VersionType versionType) {
- return true;
- }
- };
- /**
- * When a row already exists, choose the latest version.
- */
- public static final ReplicationMode LATEST_VERSION = new ReplicationMode("LATEST_VERSION") {
- public boolean shouldOverwriteCurrentVersion(Object entity, Object currentVersion, Object newVersion, VersionType versionType) {
- if (versionType==null) return true; //always overwrite nonversioned data
- return versionType.getComparator().compare(currentVersion, newVersion) <= 0;
- }
- };
-
- static {
- INSTANCES.put( LATEST_VERSION.name, LATEST_VERSION );
- INSTANCES.put( IGNORE.name, IGNORE );
- INSTANCES.put( OVERWRITE.name, OVERWRITE );
- INSTANCES.put( EXCEPTION.name, EXCEPTION );
- }
-
- private Object readResolve() {
- return INSTANCES.get(name);
- }
-
-}
-
-
-
-
-
-
/trunk/src/org/hibernate/ReplicationMode.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/AssertionFailure.java
===================================================================
--- trunk/src/org/hibernate/AssertionFailure.java (revision 38)
+++ trunk/src/org/hibernate/AssertionFailure.java (nonexistent)
@@ -1,55 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat Middleware LLC.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- *
- */
-package org.hibernate;
-
-import org.hibernate.exception.NestableRuntimeException;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Indicates failure of an assertion: a possible bug in Hibernate.
- *
- * @author Gavin King
- */
-public class AssertionFailure extends NestableRuntimeException {
-
- private static final Logger log = LoggerFactory.getLogger( AssertionFailure.class );
-
- private static final String MESSAGE = "an assertion failure occured" +
- " (this may indicate a bug in Hibernate, but is more likely due" +
- " to unsafe use of the session)";
-
- public AssertionFailure(String s) {
- super( s );
- log.error( MESSAGE, this );
- }
-
- public AssertionFailure(String s, Throwable t) {
- super( s, t );
- log.error( MESSAGE, t );
- }
-
-}
/trunk/src/org/hibernate/AssertionFailure.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/StaleObjectStateException.java
===================================================================
--- trunk/src/org/hibernate/StaleObjectStateException.java (revision 38)
+++ trunk/src/org/hibernate/StaleObjectStateException.java (nonexistent)
@@ -1,68 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat Middleware LLC.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- *
- */
-package org.hibernate;
-
-import java.io.Serializable;
-
-import org.hibernate.pretty.MessageHelper;
-
-/**
- * A <tt>StaleStateException</tt> that carries information
- * about a particular entity instance that was the source
- * of the failure.
- *
- * @author Gavin King
- */
-public class StaleObjectStateException extends StaleStateException {
- private final String entityName;
- private final Serializable identifier;
-
- public StaleObjectStateException(String persistentClass, Serializable identifier) {
- super("Row was updated or deleted by another transaction (or unsaved-value mapping was incorrect)");
- this.entityName = persistentClass;
- this.identifier = identifier;
- }
-
- public String getEntityName() {
- return entityName;
- }
-
- public Serializable getIdentifier() {
- return identifier;
- }
-
- public String getMessage() {
- return super.getMessage() + ": " +
- MessageHelper.infoString(entityName, identifier);
- }
-
-}
-
-
-
-
-
-
-
/trunk/src/org/hibernate/StaleObjectStateException.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/EntityMode.java
===================================================================
--- trunk/src/org/hibernate/EntityMode.java (revision 38)
+++ trunk/src/org/hibernate/EntityMode.java (nonexistent)
@@ -1,72 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat Middleware LLC.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- *
- */
-package org.hibernate;
-
-import java.util.Map;
-import java.util.HashMap;
-import java.io.Serializable;
-
-/**
- * Defines the representation modes available for entities.
- *
- * @author Steve Ebersole
- */
-public class EntityMode implements Serializable {
-
- private static final Map INSTANCES = new HashMap();
-
- public static final EntityMode POJO = new EntityMode( "pojo" );
- public static final EntityMode DOM4J = new EntityMode( "dom4j" );
- public static final EntityMode MAP = new EntityMode( "dynamic-map" );
-
- static {
- INSTANCES.put( POJO.name, POJO );
- INSTANCES.put( DOM4J.name, DOM4J );
- INSTANCES.put( MAP.name, MAP );
- }
-
- private final String name;
-
- public EntityMode(String name) {
- this.name = name;
- }
-
- public String toString() {
- return name;
- }
-
- private Object readResolve() {
- return INSTANCES.get( name );
- }
-
- public static EntityMode parse(String name) {
- EntityMode rtn = ( EntityMode ) INSTANCES.get( name );
- if ( rtn == null ) {
- // default is POJO
- rtn = POJO;
- }
- return rtn;
- }
-}
/trunk/src/org/hibernate/EntityMode.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/InvalidMappingException.java
===================================================================
--- trunk/src/org/hibernate/InvalidMappingException.java (revision 38)
+++ trunk/src/org/hibernate/InvalidMappingException.java (nonexistent)
@@ -1,66 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat Middleware LLC.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- *
- */
-package org.hibernate;
-
-/**
- * Thrown when a mapping is found to be invalid.
- * Similar to MappingException, but this contains more info about the path and type of mapping (e.g. file, resource or url)
- *
- * @author Max Rydahl Andersen
- *
- */
-public class InvalidMappingException extends MappingException {
-
- private final String path;
- private final String type;
-
- public InvalidMappingException(String customMessage, String type, String path, Throwable cause) {
- super(customMessage, cause);
- this.type=type;
- this.path=path;
- }
-
- public InvalidMappingException(String customMessage, String type, String path) {
- super(customMessage);
- this.type=type;
- this.path=path;
- }
-
- public InvalidMappingException(String type, String path) {
- this("Could not parse mapping document from " + type + (path==null?"":" " + path), type, path);
- }
-
- public InvalidMappingException(String type, String path, Throwable cause) {
- this("Could not parse mapping document from " + type + (path==null?"":" " + path), type, path, cause);
- }
-
- public String getType() {
- return type;
- }
-
- public String getPath() {
- return path;
- }
-}
/trunk/src/org/hibernate/InvalidMappingException.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/JDBCException.java
===================================================================
--- trunk/src/org/hibernate/JDBCException.java (revision 38)
+++ trunk/src/org/hibernate/JDBCException.java (nonexistent)
@@ -1,86 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat Middleware LLC.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- *
- */
-package org.hibernate;
-
-import java.sql.SQLException;
-
-
-/**
- * Wraps an <tt>SQLException</tt>. Indicates that an exception
- * occurred during a JDBC call.
- *
- * @see java.sql.SQLException
- * @author Gavin King
- */
-public class JDBCException extends HibernateException {
-
- private SQLException sqle;
- private String sql;
-
- public JDBCException(String string, SQLException root) {
- super(string, root);
- sqle=root;
- }
-
- public JDBCException(String string, SQLException root, String sql) {
- this(string, root);
- this.sql = sql;
- }
-
- /**
- * Get the SQLState of the underlying <tt>SQLException</tt>.
- * @see java.sql.SQLException
- * @return String
- */
- public String getSQLState() {
- return sqle.getSQLState();
- }
-
- /**
- * Get the <tt>errorCode</tt> of the underlying <tt>SQLException</tt>.
- * @see java.sql.SQLException
- * @return int the error code
- */
- public int getErrorCode() {
- return sqle.getErrorCode();
- }
-
- /**
- * Get the underlying <tt>SQLException</tt>.
- * @return SQLException
- */
- public SQLException getSQLException() {
- return sqle;
- }
-
- /**
- * Get the actual SQL statement that caused the exception
- * (may be null)
- */
- public String getSQL() {
- return sql;
- }
-
-}
/trunk/src/org/hibernate/JDBCException.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/QueryException.java
===================================================================
--- trunk/src/org/hibernate/QueryException.java (revision 38)
+++ trunk/src/org/hibernate/QueryException.java (nonexistent)
@@ -1,71 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat Middleware LLC.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- *
- */
-package org.hibernate;
-
-/**
- * A problem occurred translating a Hibernate query to SQL
- * due to invalid query syntax, etc.
- */
-public class QueryException extends HibernateException {
-
- private String queryString;
-
- public QueryException(String message) {
- super(message);
- }
- public QueryException(String message, Throwable e) {
- super(message, e);
- }
-
- public QueryException(String message, String queryString) {
- super(message);
- this.queryString = queryString;
- }
-
- public QueryException(Exception e) {
- super(e);
- }
- public String getQueryString() {
- return queryString;
- }
-
- public void setQueryString(String queryString) {
- this.queryString = queryString;
- }
-
- public String getMessage() {
- String msg = super.getMessage();
- if ( queryString!=null ) msg += " [" + queryString + ']';
- return msg;
- }
-
-}
-
-
-
-
-
-
-
/trunk/src/org/hibernate/QueryException.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/QueryParameterException.java
===================================================================
--- trunk/src/org/hibernate/QueryParameterException.java (revision 38)
+++ trunk/src/org/hibernate/QueryParameterException.java (nonexistent)
@@ -1,49 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat Middleware LLC.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- *
- */
-package org.hibernate;
-
-/**
- * Parameter invalid or not found in the query
- *
- * @author Emmanuel Bernard
- */
-public class QueryParameterException extends QueryException {
-
- public QueryParameterException(Exception e) {
- super( e );
- }
-
- public QueryParameterException(String message) {
- super( message );
- }
-
- public QueryParameterException(String message, Throwable e) {
- super( message, e );
- }
-
- public QueryParameterException(String message, String queryString) {
- super( message, queryString );
- }
-}
/trunk/src/org/hibernate/QueryParameterException.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/SQLQuery.java
===================================================================
--- trunk/src/org/hibernate/SQLQuery.java (revision 38)
+++ trunk/src/org/hibernate/SQLQuery.java (nonexistent)
@@ -1,116 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat Middleware LLC.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- *
- */
-package org.hibernate;
-
-import org.hibernate.type.Type;
-
-/**
- * Allows the user to declare the types and select list injection
- * points of all entities returned by the query. Also allows
- * declaration of the type and column alias of any scalar results
- * of the query.
- *
- * @author Gavin King
- */
-public interface SQLQuery extends Query {
- /**
- * Declare a "root" entity, without specifying an alias
- */
- public SQLQuery addEntity(String entityName);
- /**
- * Declare a "root" entity
- */
- public SQLQuery addEntity(String alias, String entityName);
- /**
- * Declare a "root" entity, specifying a lock mode
- */
- public SQLQuery addEntity(String alias, String entityName, LockMode lockMode);
- /**
- * Declare a "root" entity, without specifying an alias
- */
- public SQLQuery addEntity(Class entityClass);
- /**
- * Declare a "root" entity
- */
- public SQLQuery addEntity(String alias, Class entityClass);
- /**
- * Declare a "root" entity, specifying a lock mode
- */
- public SQLQuery addEntity(String alias, Class entityClass, LockMode lockMode);
-
- /**
- * Declare a "joined" entity
- */
- public SQLQuery addJoin(String alias, String path);
- /**
- * Declare a "joined" entity, specifying a lock mode
- */
- public SQLQuery addJoin(String alias, String path, LockMode lockMode);
-
- /**
- * Declare a scalar query result
- */
- public SQLQuery addScalar(String columnAlias, Type type);
-
- /**
- * Declare a scalar query. Hibernate will attempt to automatically detect the underlying type.
- */
- public SQLQuery addScalar(String columnAlias);
-
- /**
- * Use a predefined named ResultSetMapping
- */
- public SQLQuery setResultSetMapping(String name);
-
- /**
- * Adds a query space for auto-flush synchronization.
- *
- * @param querySpace The query space to be auto-flushed for this query.
- * @return this, for method chaning
- */
- public SQLQuery addSynchronizedQuerySpace(String querySpace);
-
- /**
- * Adds an entity name or auto-flush synchronization.
- *
- * @param entityName The name of the entity upon whose defined
- * query spaces we should additionally synchronize.
- * @return this, for method chaning
- * @throws MappingException Indicates the given entity name could not be
- * resolved.
- */
- public SQLQuery addSynchronizedEntityName(String entityName) throws MappingException;
-
- /**
- * Adds an entity name or auto-flush synchronization.
- *
- * @param entityClass The class of the entity upon whose defined
- * query spaces we should additionally synchronize.
- * @return this, for method chaning
- * @throws MappingException Indicates the given entity class could not be
- * resolved.
- */
- public SQLQuery addSynchronizedEntityClass(Class entityClass) throws MappingException;
-}
/trunk/src/org/hibernate/SQLQuery.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/PropertyAccessException.java
===================================================================
--- trunk/src/org/hibernate/PropertyAccessException.java (revision 38)
+++ trunk/src/org/hibernate/PropertyAccessException.java (nonexistent)
@@ -1,73 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat Middleware LLC.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- *
- */
-package org.hibernate;
-
-import org.hibernate.util.StringHelper;
-
-/**
- * A problem occurred accessing a property of an instance of a
- * persistent class by reflection, or via CGLIB. There are a
- * number of possible underlying causes, including
- * <ul>
- * <li>failure of a security check
- * <li>an exception occurring inside the getter or setter method
- * <li>a nullable database column was mapped to a primitive-type property
- * <li>the Hibernate type was not castable to the property type (or vice-versa)
- * </ul>
- * @author Gavin King
- */
-public class PropertyAccessException extends HibernateException {
-
- private final Class persistentClass;
- private final String propertyName;
- private final boolean wasSetter;
-
- public PropertyAccessException(Throwable root, String s, boolean wasSetter, Class persistentClass, String propertyName) {
- super(s, root);
- this.persistentClass = persistentClass;
- this.wasSetter = wasSetter;
- this.propertyName = propertyName;
- }
-
- public Class getPersistentClass() {
- return persistentClass;
- }
-
- public String getPropertyName() {
- return propertyName;
- }
-
- public String getMessage() {
- return super.getMessage() +
- ( wasSetter ? " setter of " : " getter of ") +
- StringHelper.qualify( persistentClass.getName(), propertyName );
- }
-}
-
-
-
-
-
-
/trunk/src/org/hibernate/PropertyAccessException.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/Filter.java
===================================================================
--- trunk/src/org/hibernate/Filter.java (revision 38)
+++ trunk/src/org/hibernate/Filter.java (nonexistent)
@@ -1,91 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat Middleware LLC.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- *
- */
-package org.hibernate;
-
-import org.hibernate.engine.FilterDefinition;
-
-import java.util.Collection;
-
-/**
- * Type definition of Filter. Filter defines the user's view into enabled dynamic filters,
- * allowing them to set filter parameter values.
- *
- * @author Steve Ebersole
- */
-public interface Filter {
-
- /**
- * Get the name of this filter.
- *
- * @return This filter's name.
- */
- public String getName();
-
- /**
- * Get the filter definition containing additional information about the
- * filter (such as default-condition and expected parameter names/types).
- *
- * @return The filter definition
- */
- public FilterDefinition getFilterDefinition();
-
-
- /**
- * Set the named parameter's value for this filter.
- *
- * @param name The parameter's name.
- * @param value The value to be applied.
- * @return This FilterImpl instance (for method chaining).
- */
- public Filter setParameter(String name, Object value);
-
- /**
- * Set the named parameter's value list for this filter. Used
- * in conjunction with IN-style filter criteria.
- *
- * @param name The parameter's name.
- * @param values The values to be expanded into an SQL IN list.
- * @return This FilterImpl instance (for method chaining).
- */
- public Filter setParameterList(String name, Collection values);
-
- /**
- * Set the named parameter's value list for this filter. Used
- * in conjunction with IN-style filter criteria.
- *
- * @param name The parameter's name.
- * @param values The values to be expanded into an SQL IN list.
- * @return This FilterImpl instance (for method chaining).
- */
- public Filter setParameterList(String name, Object[] values);
-
- /**
- * Perform validation of the filter state. This is used to verify the
- * state of the filter after its enablement and before its use.
- *
- * @throws HibernateException If the state is not currently valid.
- */
- public void validate() throws HibernateException;
-}
/trunk/src/org/hibernate/Filter.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/FlushMode.java
===================================================================
--- trunk/src/org/hibernate/FlushMode.java (revision 38)
+++ trunk/src/org/hibernate/FlushMode.java (nonexistent)
@@ -1,115 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat Middleware LLC.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- *
- */
-package org.hibernate;
-
-import java.io.Serializable;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Represents a flushing strategy. The flush process synchronizes
- * database state with session state by detecting state changes
- * and executing SQL statements.
- *
- * @see Session#setFlushMode(FlushMode)
- * @see Query#setFlushMode(FlushMode)
- * @see Criteria#setFlushMode(FlushMode)
- *
- * @author Gavin King
- */
-public final class FlushMode implements Serializable {
- private static final Map INSTANCES = new HashMap();
-
- private final int level;
- private final String name;
-
- private FlushMode(int level, String name) {
- this.level = level;
- this.name = name;
- }
-
- public String toString() {
- return name;
- }
-
- /**
- * The {@link Session} is never flushed unless {@link Session#flush}
- * is explicitly called by the application. This mode is very
- * efficient for read only transactions.
- *
- * @deprecated use {@link #MANUAL} instead.
- */
- public static final FlushMode NEVER = new FlushMode( 0, "NEVER" );
-
- /**
- * The {@link Session} is only ever flushed when {@link Session#flush}
- * is explicitly called by the application. This mode is very
- * efficient for read only transactions.
- */
- public static final FlushMode MANUAL = new FlushMode( 0, "MANUAL" );
-
- /**
- * The {@link Session} is flushed when {@link Transaction#commit}
- * is called.
- */
- public static final FlushMode COMMIT = new FlushMode(5, "COMMIT");
-
- /**
- * The {@link Session} is sometimes flushed before query execution
- * in order to ensure that queries never return stale state. This
- * is the default flush mode.
- */
- public static final FlushMode AUTO = new FlushMode(10, "AUTO");
-
- /**
- * The {@link Session} is flushed before every query. This is
- * almost always unnecessary and inefficient.
- */
- public static final FlushMode ALWAYS = new FlushMode(20, "ALWAYS");
-
- public boolean lessThan(FlushMode other) {
- return this.level<other.level;
- }
-
- static {
- INSTANCES.put( NEVER.name, NEVER );
- INSTANCES.put( MANUAL.name, MANUAL );
- INSTANCES.put( AUTO.name, AUTO );
- INSTANCES.put( ALWAYS.name, ALWAYS );
- INSTANCES.put( COMMIT.name, COMMIT );
- }
-
- public static boolean isManualFlushMode(FlushMode mode) {
- return MANUAL.level == mode.level;
- }
-
- private Object readResolve() {
- return INSTANCES.get( name );
- }
-
- public static FlushMode parse(String name) {
- return ( FlushMode ) INSTANCES.get( name );
- }
-}
/trunk/src/org/hibernate/FlushMode.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/TypeMismatchException.java
===================================================================
--- trunk/src/org/hibernate/TypeMismatchException.java (revision 38)
+++ trunk/src/org/hibernate/TypeMismatchException.java (nonexistent)
@@ -1,44 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat Middleware LLC.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- *
- */
-package org.hibernate;
-
-/**
- * Used when a user provided type does not match the expected one
- *
- * @author Emmanuel Bernard
- */
-public class TypeMismatchException extends HibernateException {
- public TypeMismatchException(Throwable root) {
- super( root );
- }
-
- public TypeMismatchException(String s) {
- super( s );
- }
-
- public TypeMismatchException(String string, Throwable root) {
- super( string, root );
- }
-}
/trunk/src/org/hibernate/TypeMismatchException.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/NonUniqueObjectException.java
===================================================================
--- trunk/src/org/hibernate/NonUniqueObjectException.java (revision 38)
+++ trunk/src/org/hibernate/NonUniqueObjectException.java (nonexistent)
@@ -1,67 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat Middleware LLC.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- *
- */
-package org.hibernate;
-
-import java.io.Serializable;
-
-import org.hibernate.pretty.MessageHelper;
-
-/**
- * This exception is thrown when an operation would
- * break session-scoped identity. This occurs if the
- * user tries to associate two different instances of
- * the same Java class with a particular identifier,
- * in the scope of a single <tt>Session</tt>.
- *
- * @author Gavin King
- */
-public class NonUniqueObjectException extends HibernateException {
- private final Serializable identifier;
- private final String entityName;
-
- public NonUniqueObjectException(String message, Serializable id, String clazz) {
- super(message);
- this.entityName = clazz;
- this.identifier = id;
- }
-
- public NonUniqueObjectException(Serializable id, String clazz) {
- this("a different object with the same identifier value was already associated with the session", id, clazz);
- }
-
- public Serializable getIdentifier() {
- return identifier;
- }
-
- public String getMessage() {
- return super.getMessage() + ": " +
- MessageHelper.infoString(entityName, identifier);
- }
-
- public String getEntityName() {
- return entityName;
- }
-
-}
/trunk/src/org/hibernate/NonUniqueObjectException.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/MappingNotFoundException.java
===================================================================
--- trunk/src/org/hibernate/MappingNotFoundException.java (revision 38)
+++ trunk/src/org/hibernate/MappingNotFoundException.java (nonexistent)
@@ -1,64 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat Middleware LLC.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- *
- */
-package org.hibernate;
-
-/**
- * Thrown when a resource for a mapping could not be found.
- *
- * @author Max Rydahl Andersen
- */
-public class MappingNotFoundException extends MappingException {
-
- private final String path;
- private final String type;
-
- public MappingNotFoundException(String customMessage, String type, String path, Throwable cause) {
- super(customMessage, cause);
- this.type=type;
- this.path=path;
- }
-
- public MappingNotFoundException(String customMessage, String type, String path) {
- super(customMessage);
- this.type=type;
- this.path=path;
- }
-
- public MappingNotFoundException(String type, String path) {
- this(type + ": " + path + " not found", type, path);
- }
-
- public MappingNotFoundException(String type, String path, Throwable cause) {
- this(type + ": " + path + " not found", type, path, cause);
- }
-
- public String getType() {
- return type;
- }
-
- public String getPath() {
- return path;
- }
-}
/trunk/src/org/hibernate/MappingNotFoundException.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/StaleStateException.java
===================================================================
--- trunk/src/org/hibernate/StaleStateException.java (revision 38)
+++ trunk/src/org/hibernate/StaleStateException.java (nonexistent)
@@ -1,44 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat Middleware LLC.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- *
- */
-package org.hibernate;
-
-/**
- * Thrown when a version number or timestamp check failed, indicating that the
- * <tt>Session</tt> contained stale data (when using long transactions
- * with versioning). Also occurs if we try delete or update a row that does
- * not exist.<br>
- * <br>
- * Note that this exception often indicates that the user failed to specify the
- * correct <tt>unsaved-value</tt> strategy for a class!
- *
- * @see StaleObjectStateException
- * @author Gavin King
- */
-public class StaleStateException extends HibernateException {
-
- public StaleStateException(String s) {
- super(s);
- }
-}
/trunk/src/org/hibernate/StaleStateException.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/LockMode.java
===================================================================
--- trunk/src/org/hibernate/LockMode.java (revision 38)
+++ trunk/src/org/hibernate/LockMode.java (nonexistent)
@@ -1,129 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat Middleware LLC.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- *
- */
-package org.hibernate;
-
-import java.io.Serializable;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Instances represent a lock mode for a row of a relational
- * database table. It is not intended that users spend much
- * time worrying about locking since Hibernate usually
- * obtains exactly the right lock level automatically.
- * Some "advanced" users may wish to explicitly specify lock
- * levels.
- *
- * @see Session#lock(Object,LockMode)
- * @author Gavin King
- */
-public final class LockMode implements Serializable {
- private final int level;
- private final String name;
- private static final Map INSTANCES = new HashMap();
-
- private LockMode(int level, String name) {
- this.level=level;
- this.name=name;
- }
- public String toString() {
- return name;
- }
- /**
- * Check if this lock mode is more restrictive than the given lock mode.
- *
- * @param mode LockMode to check
- * @return true if this lock mode is more restrictive than given lock mode
- */
- public boolean greaterThan(LockMode mode) {
- return level > mode.level;
- }
- /**
- * Check if this lock mode is less restrictive than the given lock mode.
- *
- * @param mode LockMode to check
- * @return true if this lock mode is less restrictive than given lock mode
- */
- public boolean lessThan(LockMode mode) {
- return level < mode.level;
- }
- /**
- * No lock required. If an object is requested with this lock
- * mode, a <tt>READ</tt> lock will be obtained if it is
- * necessary to actually read the state from the database,
- * rather than pull it from a cache.<br>
- * <br>
- * This is the "default" lock mode.
- */
- public static final LockMode NONE = new LockMode(0, "NONE");
- /**
- * A shared lock. Objects in this lock mode were read from
- * the database in the current transaction, rather than being
- * pulled from a cache.
- */
- public static final LockMode READ = new LockMode(5, "READ");
- /**
- * An upgrade lock. Objects loaded in this lock mode are
- * materialized using an SQL <tt>select ... for update</tt>.
- */
- public static final LockMode UPGRADE = new LockMode(10, "UPGRADE");
- /**
- * Attempt to obtain an upgrade lock, using an Oracle-style
- * <tt>select for update nowait</tt>. The semantics of
- * this lock mode, once obtained, are the same as
- * <tt>UPGRADE</tt>.
- */
- public static final LockMode UPGRADE_NOWAIT = new LockMode(10, "UPGRADE_NOWAIT");
- /**
- * A <tt>WRITE</tt> lock is obtained when an object is updated
- * or inserted. This lock mode is for internal use only and is
- * not a valid mode for <tt>load()</tt> or <tt>lock()</tt> (both
- * of which throw exceptions if WRITE is specified).
- */
- public static final LockMode WRITE = new LockMode(10, "WRITE");
-
- /**
- * Similiar to {@link #UPGRADE} except that, for versioned entities,
- * it results in a forced version increment.
- */
- public static final LockMode FORCE = new LockMode( 15, "FORCE" );
-
- static {
- INSTANCES.put( NONE.name, NONE );
- INSTANCES.put( READ.name, READ );
- INSTANCES.put( UPGRADE.name, UPGRADE );
- INSTANCES.put( UPGRADE_NOWAIT.name, UPGRADE_NOWAIT );
- INSTANCES.put( WRITE.name, WRITE );
- INSTANCES.put( FORCE.name, FORCE );
- }
-
- private Object readResolve() {
- return parse( name );
- }
-
- public static LockMode parse(String name) {
- return ( LockMode ) INSTANCES.get(name);
- }
-}
/trunk/src/org/hibernate/LockMode.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/FetchMode.java
===================================================================
--- trunk/src/org/hibernate/FetchMode.java (revision 38)
+++ trunk/src/org/hibernate/FetchMode.java (nonexistent)
@@ -1,93 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat Middleware LLC.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- *
- */
-package org.hibernate;
-
-import java.io.Serializable;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Represents an association fetching strategy. This is used
- * together with the <tt>Criteria</tt> API to specify runtime
- * fetching strategies.<br>
- * <br>
- * For HQL queries, use the <tt>FETCH</tt> keyword instead.
- *
- * @see Criteria#setFetchMode(java.lang.String, FetchMode)
- * @author Gavin King
- */
-public final class FetchMode implements Serializable {
- private final String name;
- private static final Map INSTANCES = new HashMap();
-
- private FetchMode(String name) {
- this.name=name;
- }
- public String toString() {
- return name;
- }
- /**
- * Default to the setting configured in the mapping file.
- */
- public static final FetchMode DEFAULT = new FetchMode("DEFAULT");
-
- /**
- * Fetch using an outer join. Equivalent to <tt>fetch="join"</tt>.
- */
- public static final FetchMode JOIN = new FetchMode("JOIN");
- /**
- * Fetch eagerly, using a separate select. Equivalent to
- * <tt>fetch="select"</tt>.
- */
- public static final FetchMode SELECT = new FetchMode("SELECT");
-
- /**
- * Fetch lazily. Equivalent to <tt>outer-join="false"</tt>.
- * @deprecated use <tt>FetchMode.SELECT</tt>
- */
- public static final FetchMode LAZY = SELECT;
- /**
- * Fetch eagerly, using an outer join. Equivalent to
- * <tt>outer-join="true"</tt>.
- * @deprecated use <tt>FetchMode.JOIN</tt>
- */
- public static final FetchMode EAGER = JOIN;
-
- static {
- INSTANCES.put( JOIN.name, JOIN );
- INSTANCES.put( SELECT.name, SELECT );
- INSTANCES.put( DEFAULT.name, DEFAULT );
- }
-
- private Object readResolve() {
- return INSTANCES.get(name);
- }
-
-}
-
-
-
-
-
/trunk/src/org/hibernate/FetchMode.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/NonUniqueResultException.java
===================================================================
--- trunk/src/org/hibernate/NonUniqueResultException.java (revision 38)
+++ trunk/src/org/hibernate/NonUniqueResultException.java (nonexistent)
@@ -1,40 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat Middleware LLC.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- *
- */
-package org.hibernate;
-
-/**
- * Thrown when the application calls <tt>Query.uniqueResult()</tt> and
- * the query returned more than one result. Unlike all other Hibernate
- * exceptions, this one is recoverable!
- *
- * @author Gavin King
- */
-public class NonUniqueResultException extends HibernateException {
-
- public NonUniqueResultException(int resultCount) {
- super( "query did not return a unique result: " + resultCount );
- }
-
-}
/trunk/src/org/hibernate/NonUniqueResultException.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/PropertyValueException.java
===================================================================
--- trunk/src/org/hibernate/PropertyValueException.java (revision 38)
+++ trunk/src/org/hibernate/PropertyValueException.java (nonexistent)
@@ -1,79 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat Middleware LLC.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- *
- */
-package org.hibernate;
-
-import org.hibernate.util.StringHelper;
-
-/**
- * Thrown when the (illegal) value of a property can not be persisted.
- * There are two main causes:
- * <ul>
- * <li>a property declared <tt>not-null="true"</tt> is null
- * <li>an association references an unsaved transient instance
- * </ul>
- * @author Gavin King
- */
-public class PropertyValueException extends HibernateException {
-
- private final String entityName;
- private final String propertyName;
-
- public PropertyValueException(String s, String entityName, String propertyName) {
- super(s);
- this.entityName = entityName;
- this.propertyName = propertyName;
- }
-
- public String getEntityName() {
- return entityName;
- }
-
- public String getPropertyName() {
- return propertyName;
- }
-
- public String getMessage() {
- return super.getMessage() + ": " +
- StringHelper.qualify(entityName, propertyName);
- }
-
- /**
- * Return a well formed property path.
- * Basicaly, it will return parent.child
- *
- * @param parent parent in path
- * @param child child in path
- * @return parent-child path
- */
- public static String buildPropertyPath(String parent, String child) {
- return new StringBuffer(parent).append('.').append(child).toString();
- }
-}
-
-
-
-
-
-
/trunk/src/org/hibernate/PropertyValueException.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/SessionException.java
===================================================================
--- trunk/src/org/hibernate/SessionException.java (revision 38)
+++ trunk/src/org/hibernate/SessionException.java (nonexistent)
@@ -1,45 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat Middleware LLC.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- *
- */
-package org.hibernate;
-
-/**
- * Thrown when the user calls a method of a {@link Session} that is in an
- * inappropropriate state for the given call (for example, the the session
- * is closed or disconnected).
- *
- * @author Gavin King
- */
-public class SessionException extends HibernateException {
-
- /**
- * Constructs a new SessionException with the given message.
- *
- * @param message The message indicating the specific problem.
- */
- public SessionException(String message) {
- super( message );
- }
-
-}
/trunk/src/org/hibernate/SessionException.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/Criteria.java
===================================================================
--- trunk/src/org/hibernate/Criteria.java (revision 38)
+++ trunk/src/org/hibernate/Criteria.java (nonexistent)
@@ -1,361 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat Middleware LLC.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- *
- */
-package org.hibernate;
-
-import java.util.List;
-
-import org.hibernate.criterion.CriteriaSpecification;
-import org.hibernate.criterion.Criterion;
-import org.hibernate.criterion.Order;
-import org.hibernate.criterion.Projection;
-import org.hibernate.transform.ResultTransformer;
-
-/**
- * <tt>Criteria</tt> is a simplified API for retrieving entities
- * by composing <tt>Criterion</tt> objects. This is a very
- * convenient approach for functionality like "search" screens
- * where there is a variable number of conditions to be placed
- * upon the result set.<br>
- * <br>
- * The <tt>Session</tt> is a factory for <tt>Criteria</tt>.
- * <tt>Criterion</tt> instances are usually obtained via
- * the factory methods on <tt>Restrictions</tt>. eg.
- * <pre>
- * List cats = session.createCriteria(Cat.class)
- * .add( Restrictions.like("name", "Iz%") )
- * .add( Restrictions.gt( "weight", new Float(minWeight) ) )
- * .addOrder( Order.asc("age") )
- * .list();
- * </pre>
- * You may navigate associations using <tt>createAlias()</tt> or
- * <tt>createCriteria()</tt>.
- * <pre>
- * List cats = session.createCriteria(Cat.class)
- * .createCriteria("kittens")
- * .add( Restrictions.like("name", "Iz%") )
- * .list();
- * </pre>
- * <pre>
- * List cats = session.createCriteria(Cat.class)
- * .createAlias("kittens", "kit")
- * .add( Restrictions.like("kit.name", "Iz%") )
- * .list();
- * </pre>
- * You may specify projection and aggregation using <tt>Projection</tt>
- * instances obtained via the factory methods on <tt>Projections</tt>.
- * <pre>
- * List cats = session.createCriteria(Cat.class)
- * .setProjection( Projections.projectionList()
- * .add( Projections.rowCount() )
- * .add( Projections.avg("weight") )
- * .add( Projections.max("weight") )
- * .add( Projections.min("weight") )
- * .add( Projections.groupProperty("color") )
- * )
- * .addOrder( Order.asc("color") )
- * .list();
- * </pre>
- *
- * @see Session#createCriteria(java.lang.Class)
- * @see org.hibernate.criterion.Restrictions
- * @see org.hibernate.criterion.Projections
- * @see org.hibernate.criterion.Order
- * @see org.hibernate.criterion.Criterion
- * @see org.hibernate.criterion.Projection
- * @see org.hibernate.criterion.DetachedCriteria a disconnected version of this API
- * @author Gavin King
- */
-public interface Criteria extends CriteriaSpecification {
-
- /**
- * Get the alias of the entity encapsulated by this criteria instance.
- *
- * @return The alias for the encapsulated entity.
- */
- public String getAlias();
-
- /**
- * Used to specify that the query results will be a projection (scalar in
- * nature). Implicitly specifies the {@link #PROJECTION} result transformer.
- * <p/>
- * The individual components contained within the given
- * {@link Projection projection} determines the overall "shape" of the
- * query result.
- *
- * @param projection The projection representing the overall "shape" of the
- * query results.
- * @return this (for method chaining)
- */
- public Criteria setProjection(Projection projection);
-
- /**
- * Add a {@link Criterion restriction} to constrain the results to be
- * retrieved.
- *
- * @param criterion The {@link Criterion criterion} object representing the
- * restriction to be applied.
- * @return this (for method chaining)
- */
- public Criteria add(Criterion criterion);
-
- /**
- * Add an {@link Order ordering} to the result set.
- *
- * @param order The {@link Order order} object representing an ordering
- * to be applied to the results.
- * @return this (for method chaining)
- */
- public Criteria addOrder(Order order);
-
- /**
- * Specify an association fetching strategy for an association or a
- * collection of values.
- *
- * @param associationPath a dot seperated property path
- * @param mode The fetch mode for the referenced association
- * @return this (for method chaining)
- */
- public Criteria setFetchMode(String associationPath, FetchMode mode) throws HibernateException;
-
- /**
- * Set the lock mode of the current entity
- *
- * @param lockMode The lock mode to be applied
- * @return this (for method chaining)
- */
- public Criteria setLockMode(LockMode lockMode);
-
- /**
- * Set the lock mode of the aliased entity
- *
- * @param alias The previously assigned alias representing the entity to
- * which the given lock mode should apply.
- * @param lockMode The lock mode to be applied
- * @return this (for method chaining)
- */
- public Criteria setLockMode(String alias, LockMode lockMode);
-
- /**
- * Join an association, assigning an alias to the joined association.
- * <p/>
- * Functionally equivalent to {@link #createAlias(String, String, int)} using
- * {@link #INNER_JOIN} for the joinType.
- *
- * @param associationPath A dot-seperated property path
- * @param alias The alias to assign to the joined association (for later reference).
- * @return this (for method chaining)
- */
- public Criteria createAlias(String associationPath, String alias) throws HibernateException;
-
- /**
- * Join an association using the specified join-type, assigning an alias
- * to the joined association.
- * <p/>
- * The joinType is expected to be one of {@link #INNER_JOIN} (the default),
- * {@link #FULL_JOIN}, or {@link #LEFT_JOIN}.
- *
- * @param associationPath A dot-seperated property path
- * @param alias The alias to assign to the joined association (for later reference).
- * @param joinType The type of join to use.
- * @return this (for method chaining)
- */
- public Criteria createAlias(String associationPath, String alias, int joinType) throws HibernateException;
-
- /**
- * Create a new <tt>Criteria</tt>, "rooted" at the associated entity.
- * <p/>
- * Functionally equivalent to {@link #createCriteria(String, int)} using
- * {@link #INNER_JOIN} for the joinType.
- *
- * @param associationPath A dot-seperated property path
- * @return the created "sub criteria"
- */
- public Criteria createCriteria(String associationPath) throws HibernateException;
-
- /**
- * Create a new <tt>Criteria</tt>, "rooted" at the associated entity, using the
- * specified join type.
- *
- * @param associationPath A dot-seperated property path
- * @param joinType The type of join to use.
- * @return the created "sub criteria"
- */
- public Criteria createCriteria(String associationPath, int joinType) throws HibernateException;
-
- /**
- * Create a new <tt>Criteria</tt>, "rooted" at the associated entity,
- * assigning the given alias.
- * <p/>
- * Functionally equivalent to {@link #createCriteria(String, String, int)} using
- * {@link #INNER_JOIN} for the joinType.
- *
- * @param associationPath A dot-seperated property path
- * @param alias The alias to assign to the joined association (for later reference).
- * @return the created "sub criteria"
- */
- public Criteria createCriteria(String associationPath, String alias) throws HibernateException;
-
- /**
- * Create a new <tt>Criteria</tt>, "rooted" at the associated entity,
- * assigning the given alias and using the specified join type.
- *
- * @param associationPath A dot-seperated property path
- * @param alias The alias to assign to the joined association (for later reference).
- * @param joinType The type of join to use.
- * @return the created "sub criteria"
- */
- public Criteria createCriteria(String associationPath, String alias, int joinType) throws HibernateException;
-
- /**
- * Set a strategy for handling the query results. This determines the
- * "shape" of the query result.
- *
- * @param resultTransformer The transformer to apply
- * @return this (for method chaining)
- *
- * @see #ROOT_ENTITY
- * @see #DISTINCT_ROOT_ENTITY
- * @see #ALIAS_TO_ENTITY_MAP
- * @see #PROJECTION
- */
- public Criteria setResultTransformer(ResultTransformer resultTransformer);
-
- /**
- * Set a limit upon the number of objects to be retrieved.
- *
- * @param maxResults the maximum number of results
- * @return this (for method chaining)
- */
- public Criteria setMaxResults(int maxResults);
-
- /**
- * Set the first result to be retrieved.
- *
- * @param firstResult the first result to retrieve, numbered from <tt>0</tt>
- * @return this (for method chaining)
- */
- public Criteria setFirstResult(int firstResult);
-
- /**
- * Set a fetch size for the underlying JDBC query.
- *
- * @param fetchSize the fetch size
- * @return this (for method chaining)
- *
- * @see java.sql.Statement#setFetchSize
- */
- public Criteria setFetchSize(int fetchSize);
-
- /**
- * Set a timeout for the underlying JDBC query.
- *
- * @param timeout The timeout value to apply.
- * @return this (for method chaining)
- *
- * @see java.sql.Statement#setQueryTimeout
- */
- public Criteria setTimeout(int timeout);
-
- /**
- * Enable caching of this query result, provided query caching is enabled
- * for the underlying session factory.
- *
- * @param cacheable Should the result be considered cacheable; default is
- * to not cache (false).
- * @return this (for method chaining)
- */
- public Criteria setCacheable(boolean cacheable);
-
- /**
- * Set the name of the cache region to use for query result caching.
- *
- * @param cacheRegion the name of a query cache region, or <tt>null</tt>
- * for the default query cache
- * @return this (for method chaining)
- *
- * @see #setCacheable
- */
- public Criteria setCacheRegion(String cacheRegion);
-
- /**
- * Add a comment to the generated SQL.
- *
- * @param comment a human-readable string
- * @return this (for method chaining)
- */
- public Criteria setComment(String comment);
-
- /**
- * Override the flush mode for this particular query.
- *
- * @param flushMode The flush mode to use.
- * @return this (for method chaining)
- */
- public Criteria setFlushMode(FlushMode flushMode);
-
- /**
- * Override the cache mode for this particular query.
- *
- * @param cacheMode The cache mode to use.
- * @return this (for method chaining)
- */
- public Criteria setCacheMode(CacheMode cacheMode);
-
- /**
- * Get the results.
- *
- * @return The list of matched query results.
- */
- public List list() throws HibernateException;
-
- /**
- * Get the results as an instance of {@link ScrollableResults}
- *
- * @return The {@link ScrollableResults} representing the matched
- * query results.
- */
- public ScrollableResults scroll() throws HibernateException;
-
- /**
- * Get the results as an instance of {@link ScrollableResults} based on the
- * given scroll mode.
- *
- * @param scrollMode Indicates the type of underlying database cursor to
- * request.
- * @return The {@link ScrollableResults} representing the matched
- * query results.
- */
- public ScrollableResults scroll(ScrollMode scrollMode) throws HibernateException;
-
- /**
- * Convenience method to return a single instance that matches
- * the query, or null if the query returns no results.
- *
- * @return the single result or <tt>null</tt>
- * @throws HibernateException if there is more than one matching result
- */
- public Object uniqueResult() throws HibernateException;
-
-}
\ No newline at end of file
/trunk/src/org/hibernate/Criteria.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/ObjectNotFoundException.java
===================================================================
--- trunk/src/org/hibernate/ObjectNotFoundException.java (revision 38)
+++ trunk/src/org/hibernate/ObjectNotFoundException.java (nonexistent)
@@ -1,47 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat Middleware LLC.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- *
- */
-package org.hibernate;
-
-import java.io.Serializable;
-
-/**
- * Thrown when <tt>Session.load()</tt> fails to select a row with
- * the given primary key (identifier value). This exception might not
- * be thrown when <tt>load()</tt> is called, even if there was no
- * row on the database, because <tt>load()</tt> returns a proxy if
- * possible. Applications should use <tt>Session.get()</tt> to test if
- * a row exists in the database.<br>
- * <br>
- * Like all Hibernate exceptions, this exception is considered
- * unrecoverable.
- *
- * @author Gavin King
- */
-public class ObjectNotFoundException extends UnresolvableObjectException {
-
- public ObjectNotFoundException(Serializable identifier, String clazz) {
- super(identifier, clazz);
- }
-}
/trunk/src/org/hibernate/ObjectNotFoundException.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/ScrollableResults.java
===================================================================
--- trunk/src/org/hibernate/ScrollableResults.java (revision 38)
+++ trunk/src/org/hibernate/ScrollableResults.java (nonexistent)
@@ -1,227 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat Middleware LLC.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- *
- */
-package org.hibernate;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.sql.Blob;
-import java.sql.Clob;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Locale;
-import java.util.TimeZone;
-
-import org.hibernate.type.Type;
-
-/**
- * A result iterator that allows moving around within the results
- * by arbitrary increments. The <tt>Query</tt> / <tt>ScrollableResults</tt>
- * pattern is very similar to the JDBC <tt>PreparedStatement</tt>/
- * <tt>ResultSet</tt> pattern and the semantics of methods of this interface
- * are similar to the similarly named methods on <tt>ResultSet</tt>.<br>
- * <br>
- * Contrary to JDBC, columns of results are numbered from zero.
- *
- * @see Query#scroll()
- * @author Gavin King
- */
-public interface ScrollableResults {
- /**
- * Advance to the next result
- * @return <tt>true</tt> if there is another result
- */
- public boolean next() throws HibernateException;
- /**
- * Retreat to the previous result
- * @return <tt>true</tt> if there is a previous result
- */
- public boolean previous() throws HibernateException;
- /**
- * Scroll an arbitrary number of locations
- * @param i a positive (forward) or negative (backward) number of rows
- * @return <tt>true</tt> if there is a result at the new location
- */
- public boolean scroll(int i) throws HibernateException;
- /**
- * Go to the last result
- * @return <tt>true</tt> if there are any results
- */
- public boolean last() throws HibernateException;
- /**
- * Go to the first result
- * @return <tt>true</tt> if there are any results
- */
- public boolean first() throws HibernateException;
- /**
- * Go to a location just before first result (this is the initial location)
- */
- public void beforeFirst() throws HibernateException;
- /**
- * Go to a location just after the last result
- */
- public void afterLast() throws HibernateException;
- /**
- * Is this the first result?
- *
- * @return <tt>true</tt> if this is the first row of results
- * @throws HibernateException
- */
- public boolean isFirst() throws HibernateException;
- /**
- * Is this the last result?
- *
- * @return <tt>true</tt> if this is the last row of results
- * @throws HibernateException
- */
- public boolean isLast() throws HibernateException;
- /**
- * Release resources immediately.
- */
- public void close() throws HibernateException;
- /**
- * Get the current row of results
- * @return an object or array
- */
- public Object[] get() throws HibernateException;
- /**
- * Get the <tt>i</tt>th object in the current row of results, without
- * initializing any other results in the row. This method may be used
- * safely, regardless of the type of the column (ie. even for scalar
- * results).
- * @param i the column, numbered from zero
- * @return an object of any Hibernate type or <tt>null</tt>
- */
- public Object get(int i) throws HibernateException;
-
- /**
- * Get the type of the <tt>i</tt>th column of results
- * @param i the column, numbered from zero
- * @return the Hibernate type
- */
- public Type getType(int i);
-
- /**
- * Convenience method to read an <tt>integer</tt>
- */
- public Integer getInteger(int col) throws HibernateException;
- /**
- * Convenience method to read a <tt>long</tt>
- */
- public Long getLong(int col) throws HibernateException;
- /**
- * Convenience method to read a <tt>float</tt>
- */
- public Float getFloat(int col) throws HibernateException;
- /**
- * Convenience method to read a <tt>boolean</tt>
- */
- public Boolean getBoolean(int col) throws HibernateException;
- /**
- * Convenience method to read a <tt>double</tt>
- */
- public Double getDouble(int col) throws HibernateException;
- /**
- * Convenience method to read a <tt>short</tt>
- */
- public Short getShort(int col) throws HibernateException;
- /**
- * Convenience method to read a <tt>byte</tt>
- */
- public Byte getByte(int col) throws HibernateException;
- /**
- * Convenience method to read a <tt>character</tt>
- */
- public Character getCharacter(int col) throws HibernateException;
- /**
- * Convenience method to read a <tt>binary</tt>
- */
- public byte[] getBinary(int col) throws HibernateException;
- /**
- * Convenience method to read <tt>text</tt>
- */
- public String getText(int col) throws HibernateException;
- /**
- * Convenience method to read a <tt>blob</tt>
- */
- public Blob getBlob(int col) throws HibernateException;
- /**
- * Convenience method to read a <tt>clob</tt>
- */
- public Clob getClob(int col) throws HibernateException;
- /**
- * Convenience method to read a <tt>string</tt>
- */
- public String getString(int col) throws HibernateException;
- /**
- * Convenience method to read a <tt>big_decimal</tt>
- */
- public BigDecimal getBigDecimal(int col) throws HibernateException;
- /**
- * Convenience method to read a <tt>big_integer</tt>
- */
- public BigInteger getBigInteger(int col) throws HibernateException;
- /**
- * Convenience method to read a <tt>date</tt>, <tt>time</tt> or <tt>timestamp</tt>
- */
- public Date getDate(int col) throws HibernateException;
- /**
- * Convenience method to read a <tt>locale</tt>
- */
- public Locale getLocale(int col) throws HibernateException;
- /**
- * Convenience method to read a <tt>calendar</tt> or <tt>calendar_date</tt>
- */
- public Calendar getCalendar(int col) throws HibernateException;
- /**
- * Convenience method to read a <tt>currency</tt>
- */
- //public Currency getCurrency(int col) throws HibernateException;
- /**
- * Convenience method to read a <tt>timezone</tt>
- */
- public TimeZone getTimeZone(int col) throws HibernateException;
- /**
- * Get the current location in the result set. The first
- * row is number <tt>0</tt>, contrary to JDBC.
- * @return the row number, numbered from <tt>0</tt>, or <tt>-1</tt> if
- * there is no current row
- */
- public int getRowNumber() throws HibernateException;
- /**
- * Set the current location in the result set, numbered from either the
- * first row (row number <tt>0</tt>), or the last row (row
- * number <tt>-1</tt>).
- * @param rowNumber the row number, numbered from the last row, in the
- * case of a negative row number
- * @return true if there is a row at that row number
- */
- public boolean setRowNumber(int rowNumber) throws HibernateException;
-}
-
-
-
-
-
-
/trunk/src/org/hibernate/ScrollableResults.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/TransactionException.java
===================================================================
--- trunk/src/org/hibernate/TransactionException.java (revision 38)
+++ trunk/src/org/hibernate/TransactionException.java (nonexistent)
@@ -1,45 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat Middleware LLC.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- *
- */
-package org.hibernate;
-
-/**
- * Indicates that a transaction could not be begun, committed
- * or rolled back.
- *
- * @see Transaction
- * @author Anton van Straaten
- */
-
-public class TransactionException extends HibernateException {
-
- public TransactionException(String message, Throwable root) {
- super(message,root);
- }
-
- public TransactionException(String message) {
- super(message);
- }
-
-}
/trunk/src/org/hibernate/TransactionException.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/DuplicateMappingException.java
===================================================================
--- trunk/src/org/hibernate/DuplicateMappingException.java (revision 38)
+++ trunk/src/org/hibernate/DuplicateMappingException.java (nonexistent)
@@ -1,56 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat Middleware LLC.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- *
- */
-package org.hibernate;
-
-/**
- * Raised whenever a duplicate for a certain type occurs.
- * Duplicate class, table, property name etc.
- *
- * @author Max Rydahl Andersen
- *
- */
-public class DuplicateMappingException extends MappingException {
-
- private final String name;
- private final String type;
-
- public DuplicateMappingException(String customMessage, String type, String name) {
- super(customMessage);
- this.type=type;
- this.name=name;
- }
-
- public DuplicateMappingException(String type, String name) {
- this("Duplicate " + type + " mapping " + name, type, name);
- }
-
- public String getType() {
- return type;
- }
-
- public String getName() {
- return name;
- }
-}
/trunk/src/org/hibernate/DuplicateMappingException.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/ConnectionReleaseMode.java
===================================================================
--- trunk/src/org/hibernate/ConnectionReleaseMode.java (revision 38)
+++ trunk/src/org/hibernate/ConnectionReleaseMode.java (nonexistent)
@@ -1,100 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat Middleware LLC.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- *
- */
-package org.hibernate;
-
-import java.io.Serializable;
-
-/**
- * Defines the various policies by which Hibernate might release its underlying
- * JDBC connection.
- *
- * @author Steve Ebersole
- */
-public class ConnectionReleaseMode implements Serializable {
-
- /**
- * Indicates that JDBC connection should be aggressively released after each
- * SQL statement is executed. In this mode, the application <em>must</em>
- * explicitly close all iterators and scrollable results. This mode may
- * only be used with a JTA datasource.
- */
- public static final ConnectionReleaseMode AFTER_STATEMENT = new ConnectionReleaseMode( "after_statement" );
-
- /**
- * Indicates that JDBC connections should be released after each transaction
- * ends (works with both JTA-registered synch and HibernateTransaction API).
- * This mode may not be used with an application server JTA datasource.
- * <p/>
- * This is the default mode starting in 3.1; was previously {@link #ON_CLOSE}.
- */
- public static final ConnectionReleaseMode AFTER_TRANSACTION = new ConnectionReleaseMode( "after_transaction" );
-
- /**
- * Indicates that connections should only be released when the Session is explicitly closed
- * or disconnected; this is the legacy (Hibernate2 and pre-3.1) behavior.
- */
- public static final ConnectionReleaseMode ON_CLOSE = new ConnectionReleaseMode( "on_close" );
-
-
- private String name;
-
- private ConnectionReleaseMode(String name) {
- this.name = name;
- }
-
- /**
- * Override of Object.toString(). Returns the release mode name.
- *
- * @return The release mode name.
- */
- public String toString() {
- return name;
- }
-
- /**
- * Determine the correct ConnectionReleaseMode instance based on the given
- * name.
- *
- * @param modeName The release mode name.
- * @return The appropriate ConnectionReleaseMode instance
- * @throws HibernateException Indicates the modeName param did not match any known modes.
- */
- public static ConnectionReleaseMode parse(String modeName) throws HibernateException {
- if ( AFTER_STATEMENT.name.equals( modeName ) ) {
- return AFTER_STATEMENT;
- }
- else if ( AFTER_TRANSACTION.name.equals( modeName ) ) {
- return AFTER_TRANSACTION;
- }
- else if ( ON_CLOSE.name.equals( modeName ) ) {
- return ON_CLOSE;
- }
- throw new HibernateException( "could not determine appropriate connection release mode [" + modeName + "]" );
- }
-
- private Object readResolve() {
- return parse( name );
- }
-}
/trunk/src/org/hibernate/ConnectionReleaseMode.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/Query.java
===================================================================
--- trunk/src/org/hibernate/Query.java (revision 38)
+++ trunk/src/org/hibernate/Query.java (nonexistent)
@@ -1,409 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat Middleware LLC.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- *
- */
-package org.hibernate;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.Calendar;
-import java.util.Collection;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-import org.hibernate.transform.ResultTransformer;
-import org.hibernate.type.Type;
-
-/**
- * An object-oriented representation of a Hibernate query. A <tt>Query</tt>
- * instance is obtained by calling <tt>Session.createQuery()</tt>. This
- * interface exposes some extra functionality beyond that provided by
- * <tt>Session.iterate()</tt> and <tt>Session.find()</tt>:
- * <ul>
- * <li>a particular page of the result set may be selected by calling <tt>
- * setMaxResults(), setFirstResult()</tt>
- * <li>named query parameters may be used
- * <li>the results may be returned as an instance of <tt>ScrollableResults</tt>
- * </ul>
- * <br>
- * Named query parameters are tokens of the form <tt>:name</tt> in the
- * query string. A value is bound to the <tt>integer</tt> parameter
- * <tt>:foo</tt> by calling<br>
- * <br>
- * <tt>setParameter("foo", foo, Hibernate.INTEGER);</tt><br>
- * <br>
- * for example. A name may appear multiple times in the query string.<br>
- * <br>
- * JDBC-style <tt>?</tt> parameters are also supported. To bind a
- * value to a JDBC-style parameter use a set method that accepts an
- * <tt>int</tt> positional argument (numbered from zero, contrary
- * to JDBC).<br>
- * <br>
- * You may not mix and match JDBC-style parameters and named parameters
- * in the same query.<br>
- * <br>
- * Queries are executed by calling <tt>list()</tt>, <tt>scroll()</tt> or
- * <tt>iterate()</tt>. A query may be re-executed by subsequent invocations.
- * Its lifespan is, however, bounded by the lifespan of the <tt>Session</tt>
- * that created it.<br>
- * <br>
- * Implementors are not intended to be threadsafe.
- *
- * @see org.hibernate.Session#createQuery(java.lang.String)
- * @see org.hibernate.ScrollableResults
- * @author Gavin King
- */
-public interface Query {
- /**
- * Get the query string.
- *
- * @return the query string
- */
- public String getQueryString();
- /**
- * Return the Hibernate types of the query result set.
- * @return an array of types
- */
- public Type[] getReturnTypes() throws HibernateException;
- /**
- * Return the HQL select clause aliases (if any)
- * @return an array of aliases as strings
- */
- public String[] getReturnAliases() throws HibernateException;
- /**
- * Return the names of all named parameters of the query.
- * @return the parameter names, in no particular order
- */
- public String[] getNamedParameters() throws HibernateException;
- /**
- * Return the query results as an <tt>Iterator</tt>. If the query
- * contains multiple results pre row, the results are returned in
- * an instance of <tt>Object[]</tt>.<br>
- * <br>
- * Entities returned as results are initialized on demand. The first
- * SQL query returns identifiers only.<br>
- *
- * @return the result iterator
- * @throws HibernateException
- */
- public Iterator iterate() throws HibernateException;
- /**
- * Return the query results as <tt>ScrollableResults</tt>. The
- * scrollability of the returned results depends upon JDBC driver
- * support for scrollable <tt>ResultSet</tt>s.<br>
- *
- * @see ScrollableResults
- * @return the result iterator
- * @throws HibernateException
- */
- public ScrollableResults scroll() throws HibernateException;
- /**
- * Return the query results as <tt>ScrollableResults</tt>. The
- * scrollability of the returned results depends upon JDBC driver
- * support for scrollable <tt>ResultSet</tt>s.<br>
- *
- * @see ScrollableResults
- * @see ScrollMode
- * @return the result iterator
- * @throws HibernateException
- */
- public ScrollableResults scroll(ScrollMode scrollMode) throws HibernateException;
- /**
- * Return the query results as a <tt>List</tt>. If the query contains
- * multiple results pre row, the results are returned in an instance
- * of <tt>Object[]</tt>.
- *
- * @return the result list
- * @throws HibernateException
- */
- public List list() throws HibernateException;
- /**
- * Convenience method to return a single instance that matches
- * the query, or null if the query returns no results.
- *
- * @return the single result or <tt>null</tt>
- * @throws NonUniqueResultException if there is more than one matching result
- */
- public Object uniqueResult() throws HibernateException;
-
- /**
- * Execute the update or delete statement.
- * </p>
- * The semantics are compliant with the ejb3 Query.executeUpdate()
- * method.
- *
- * @return The number of entities updated or deleted.
- * @throws HibernateException
- */
- public int executeUpdate() throws HibernateException;
-
- /**
- * Set the maximum number of rows to retrieve. If not set,
- * there is no limit to the number of rows retrieved.
- * @param maxResults the maximum number of rows
- */
- public Query setMaxResults(int maxResults);
- /**
- * Set the first row to retrieve. If not set, rows will be
- * retrieved beginnning from row <tt>0</tt>.
- * @param firstResult a row number, numbered from <tt>0</tt>
- */
- public Query setFirstResult(int firstResult);
-
- /**
- * Entities retrieved by this query will be loaded in
- * a read-only mode where Hibernate will never dirty-check
- * them or make changes persistent.
- *
- */
- public Query setReadOnly(boolean readOnly);
-
- /**
- * Enable caching of this query result set.
- * @param cacheable Should the query results be cacheable?
- */
- public Query setCacheable(boolean cacheable);
-
- /**
- * Set the name of the cache region.
- * @param cacheRegion the name of a query cache region, or <tt>null</tt>
- * for the default query cache
- */
- public Query setCacheRegion(String cacheRegion);
-
- /**
- * Set a timeout for the underlying JDBC query.
- * @param timeout the timeout in seconds
- */
- public Query setTimeout(int timeout);
- /**
- * Set a fetch size for the underlying JDBC query.
- * @param fetchSize the fetch size
- */
- public Query setFetchSize(int fetchSize);
-
- /**
- * Set the lockmode for the objects idententified by the
- * given alias that appears in the <tt>FROM</tt> clause.
- * @param alias a query alias, or <tt>this</tt> for a collection filter
- */
- public Query setLockMode(String alias, LockMode lockMode);
-
- /**
- * Add a comment to the generated SQL.
- * @param comment a human-readable string
- */
- public Query setComment(String comment);
-
- /**
- * Override the current session flush mode, just for
- * this query.
- * @see org.hibernate.FlushMode
- */
- public Query setFlushMode(FlushMode flushMode);
-
- /**
- * Override the current session cache mode, just for
- * this query.
- * @see org.hibernate.CacheMode
- */
- public Query setCacheMode(CacheMode cacheMode);
-
- /**
- * Bind a value to a JDBC-style query parameter.
- * @param position the position of the parameter in the query
- * string, numbered from <tt>0</tt>.
- * @param val the possibly-null parameter value
- * @param type the Hibernate type
- */
- public Query setParameter(int position, Object val, Type type);
- /**
- * Bind a value to a named query parameter.
- * @param name the name of the parameter
- * @param val the possibly-null parameter value
- * @param type the Hibernate type
- */
- public Query setParameter(String name, Object val, Type type);
-
- /**
- * Bind a value to a JDBC-style query parameter. The Hibernate type of the parameter is
- * first detected via the usage/position in the query and if not sufficient secondly
- * guessed from the class of the given object.
- * @param position the position of the parameter in the query
- * string, numbered from <tt>0</tt>.
- * @param val the non-null parameter value
- * @throws org.hibernate.HibernateException if no type could be determined
- */
- public Query setParameter(int position, Object val) throws HibernateException;
- /**
- * Bind a value to a named query parameter. The Hibernate type of the parameter is
- * first detected via the usage/position in the query and if not sufficient secondly
- * guessed from the class of the given object.
- * @param name the name of the parameter
- * @param val the non-null parameter value
- * @throws org.hibernate.HibernateException if no type could be determined
- */
- public Query setParameter(String name, Object val) throws HibernateException;
-
- /**
- * Bind values and types to positional parameters.
- */
- public Query setParameters(Object[] values, Type[] types) throws HibernateException;
-
- /**
- * Bind multiple values to a named query parameter. This is useful for binding
- * a list of values to an expression such as <tt>foo.bar in (:value_list)</tt>.
- * @param name the name of the parameter
- * @param vals a collection of values to list
- * @param type the Hibernate type of the values
- */
- public Query setParameterList(String name, Collection vals, Type type) throws HibernateException;
-
- /**
- * Bind multiple values to a named query parameter. The Hibernate type of the parameter is
- * first detected via the usage/position in the query and if not sufficient secondly
- * guessed from the class of the first object in the collection. This is useful for binding a list of values
- * to an expression such as <tt>foo.bar in (:value_list)</tt>.
- * @param name the name of the parameter
- * @param vals a collection of values to list
- */
- public Query setParameterList(String name, Collection vals) throws HibernateException;
-
- /**
- * Bind multiple values to a named query parameter. This is useful for binding
- * a list of values to an expression such as <tt>foo.bar in (:value_list)</tt>.
- * @param name the name of the parameter
- * @param vals a collection of values to list
- * @param type the Hibernate type of the values
- */
- public Query setParameterList(String name, Object[] vals, Type type) throws HibernateException;
-
- /**
- * Bind multiple values to a named query parameter. The Hibernate type of the parameter is
- * first detected via the usage/position in the query and if not sufficient secondly
- * guessed from the class of the first object in the array. This is useful for binding a list of values
- * to an expression such as <tt>foo.bar in (:value_list)</tt>.
- * @param name the name of the parameter
- * @param vals a collection of values to list
- */
- public Query setParameterList(String name, Object[] vals) throws HibernateException;
-
- /**
- * Bind the property values of the given bean to named parameters of the query,
- * matching property names with parameter names and mapping property types to
- * Hibernate types using hueristics.
- * @param bean any JavaBean or POJO
- */
- public Query setProperties(Object bean) throws HibernateException;
-
- /**
- * Bind the values of the given Map for each named parameters of the query,
- * matching key names with parameter names and mapping value types to
- * Hibernate types using hueristics.
- * @param bean a java.util.Map
- */
- public Query setProperties(Map bean) throws HibernateException;
-
- public Query setString(int position, String val);
- public Query setCharacter(int position, char val);
- public Query setBoolean(int position, boolean val);
- public Query setByte(int position, byte val);
- public Query setShort(int position, short val);
- public Query setInteger(int position, int val);
- public Query setLong(int position, long val);
- public Query setFloat(int position, float val);
- public Query setDouble(int position, double val);
- public Query setBinary(int position, byte[] val);
- public Query setText(int position, String val);
- public Query setSerializable(int position, Serializable val);
- public Query setLocale(int position, Locale locale);
- public Query setBigDecimal(int position, BigDecimal number);
- public Query setBigInteger(int position, BigInteger number);
-
- public Query setDate(int position, Date date);
- public Query setTime(int position, Date date);
- public Query setTimestamp(int position, Date date);
-
- public Query setCalendar(int position, Calendar calendar);
- public Query setCalendarDate(int position, Calendar calendar);
-
- public Query setString(String name, String val);
- public Query setCharacter(String name, char val);
- public Query setBoolean(String name, boolean val);
- public Query setByte(String name, byte val);
- public Query setShort(String name, short val);
- public Query setInteger(String name, int val);
- public Query setLong(String name, long val);
- public Query setFloat(String name, float val);
- public Query setDouble(String name, double val);
- public Query setBinary(String name, byte[] val);
- public Query setText(String name, String val);
- public Query setSerializable(String name, Serializable val);
- public Query setLocale(String name, Locale locale);
- public Query setBigDecimal(String name, BigDecimal number);
- public Query setBigInteger(String name, BigInteger number);
-
- public Query setDate(String name, Date date);
- public Query setTime(String name, Date date);
- public Query setTimestamp(String name, Date date);
-
- public Query setCalendar(String name, Calendar calendar);
- public Query setCalendarDate(String name, Calendar calendar);
-
- /**
- * Bind an instance of a mapped persistent class to a JDBC-style query parameter.
- * @param position the position of the parameter in the query
- * string, numbered from <tt>0</tt>.
- * @param val a non-null instance of a persistent class
- */
- public Query setEntity(int position, Object val); // use setParameter for null values
-
- /**
- * Bind an instance of a mapped persistent class to a named query parameter.
- * @param name the name of the parameter
- * @param val a non-null instance of a persistent class
- */
- public Query setEntity(String name, Object val); // use setParameter for null values
-
-
- /**
- * Set a strategy for handling the query results. This can be used to change
- * "shape" of the query result.
- *
- * @param transformer The transformer to apply
- * @return this (for method chaining)
- */
- public Query setResultTransformer(ResultTransformer transformer);
-
-}
-
-
-
-
-
-
-
/trunk/src/org/hibernate/Query.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/LazyInitializationException.java
===================================================================
--- trunk/src/org/hibernate/LazyInitializationException.java (revision 38)
+++ trunk/src/org/hibernate/LazyInitializationException.java (nonexistent)
@@ -1,51 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat Middleware LLC.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- *
- */
-package org.hibernate;
-
-import org.slf4j.LoggerFactory;
-
-/**
- * Indicates access to unfetched data outside of a session context.
- * For example, when an uninitialized proxy or collection is accessed
- * after the session was closed.
- *
- * @see Hibernate#initialize(java.lang.Object)
- * @see Hibernate#isInitialized(java.lang.Object)
- * @author Gavin King
- */
-public class LazyInitializationException extends HibernateException {
-
- public LazyInitializationException(String msg) {
- super(msg);
- LoggerFactory.getLogger( LazyInitializationException.class ).error( msg, this );
- }
-
-}
-
-
-
-
-
-
/trunk/src/org/hibernate/LazyInitializationException.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/PersistentObjectException.java
===================================================================
--- trunk/src/org/hibernate/PersistentObjectException.java (revision 38)
+++ trunk/src/org/hibernate/PersistentObjectException.java (nonexistent)
@@ -1,38 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat Middleware LLC.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- *
- */
-package org.hibernate;
-
-/**
- * Thrown when the user passes a persistent instance to a <tt>Session</tt>
- * method that expects a transient instance.
- *
- * @author Gavin King
- */
-public class PersistentObjectException extends HibernateException {
-
- public PersistentObjectException(String s) {
- super(s);
- }
-}
/trunk/src/org/hibernate/PersistentObjectException.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/UnresolvableObjectException.java
===================================================================
--- trunk/src/org/hibernate/UnresolvableObjectException.java (revision 38)
+++ trunk/src/org/hibernate/UnresolvableObjectException.java (nonexistent)
@@ -1,75 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat Middleware LLC.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- *
- */
-package org.hibernate;
-
-import java.io.Serializable;
-
-import org.hibernate.pretty.MessageHelper;
-
-/**
- * Thrown when Hibernate could not resolve an object by id, especially when
- * loading an association.
- *
- * @author Gavin King
- */
-public class UnresolvableObjectException extends HibernateException {
-
- private final Serializable identifier;
- private final String entityName;
-
- public UnresolvableObjectException(Serializable identifier, String clazz) {
- this("No row with the given identifier exists", identifier, clazz);
- }
- UnresolvableObjectException(String message, Serializable identifier, String clazz) {
- super(message);
- this.identifier = identifier;
- this.entityName = clazz;
- }
- public Serializable getIdentifier() {
- return identifier;
- }
-
- public String getMessage() {
- return super.getMessage() + ": " +
- MessageHelper.infoString(entityName, identifier);
- }
-
- public String getEntityName() {
- return entityName;
- }
-
- public static void throwIfNull(Object o, Serializable id, String clazz)
- throws UnresolvableObjectException {
- if (o==null) throw new UnresolvableObjectException(id, clazz);
- }
-
-}
-
-
-
-
-
-
-
/trunk/src/org/hibernate/UnresolvableObjectException.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/CacheMode.java
===================================================================
--- trunk/src/org/hibernate/CacheMode.java (revision 38)
+++ trunk/src/org/hibernate/CacheMode.java (nonexistent)
@@ -1,101 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat Middleware LLC.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- *
- */
-package org.hibernate;
-
-import java.io.Serializable;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Controls how the session interacts with the second-level
- * cache and query cache.
- *
- * @see Session#setCacheMode(CacheMode)
- * @author Gavin King
- */
-public final class CacheMode implements Serializable {
- private final String name;
- private final boolean isPutEnabled;
- private final boolean isGetEnabled;
- private static final Map INSTANCES = new HashMap();
-
- private CacheMode(String name, boolean isPutEnabled, boolean isGetEnabled) {
- this.name=name;
- this.isPutEnabled = isPutEnabled;
- this.isGetEnabled = isGetEnabled;
- }
- public String toString() {
- return name;
- }
- public boolean isPutEnabled() {
- return isPutEnabled;
- }
- public boolean isGetEnabled() {
- return isGetEnabled;
- }
- /**
- * The session may read items from the cache, and add items to the cache
- */
- public static final CacheMode NORMAL = new CacheMode("NORMAL", true, true);
- /**
- * The session will never interact with the cache, except to invalidate
- * cache items when updates occur
- */
- public static final CacheMode IGNORE = new CacheMode("IGNORE", false, false);
- /**
- * The session may read items from the cache, but will not add items,
- * except to invalidate items when updates occur
- */
- public static final CacheMode GET = new CacheMode("GET", false, true);
- /**
- * The session will never read items from the cache, but will add items
- * to the cache as it reads them from the database.
- */
- public static final CacheMode PUT = new CacheMode("PUT", true, false);
-
- /**
- * The session will never read items from the cache, but will add items
- * to the cache as it reads them from the database. In this mode, the
- * effect of <tt>hibernate.cache.use_minimal_puts</tt> is bypassed, in
- * order to <em>force</em> a cache refresh
- */
- public static final CacheMode REFRESH = new CacheMode("REFRESH", true, false);
-
- static {
- INSTANCES.put( NORMAL.name, NORMAL );
- INSTANCES.put( IGNORE.name, IGNORE );
- INSTANCES.put( GET.name, GET );
- INSTANCES.put( PUT.name, PUT );
- INSTANCES.put( REFRESH.name, REFRESH );
- }
-
- private Object readResolve() {
- return INSTANCES.get( name );
- }
-
- public static CacheMode parse(String name) {
- return ( CacheMode ) INSTANCES.get( name );
- }
-}
/trunk/src/org/hibernate/CacheMode.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/StatelessSession.java
===================================================================
--- trunk/src/org/hibernate/StatelessSession.java (revision 38)
+++ trunk/src/org/hibernate/StatelessSession.java (nonexistent)
@@ -1,240 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat Middleware LLC.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- *
- */
-package org.hibernate;
-
-import java.io.Serializable;
-import java.sql.Connection;
-
-/**
- * A command-oriented API for performing bulk operations
- * against a database.<br>
- * <br>
- * A stateless session does not implement a first-level cache nor
- * interact with any second-level cache, nor does it implement
- * transactional write-behind or automatic dirty checking, nor do
- * operations cascade to associated instances. Collections are
- * ignored by a stateless session. Operations performed via a
- * stateless session bypass Hibernate's event model and
- * interceptors. Stateless sessions are vulnerable to data
- * aliasing effects, due to the lack of a first-level cache.<br>
- * <br>
- * For certain kinds of transactions, a stateless session may
- * perform slightly faster than a stateful session.
- *
- * @author Gavin King
- */
-public interface StatelessSession extends Serializable {
- /**
- * Close the stateless session and release the JDBC connection.
- */
- public void close();
-
- /**
- * Insert a row.
- *
- * @param entity a new transient instance
- */
- public Serializable insert(Object entity);
-
- /**
- * Insert a row.
- *
- * @param entityName The entityName for the entity to be inserted
- * @param entity a new transient instance
- * @return the identifier of the instance
- */
- public Serializable insert(String entityName, Object entity);
-
- /**
- * Update a row.
- *
- * @param entity a detached entity instance
- */
- public void update(Object entity);
-
- /**
- * Update a row.
- *
- * @param entityName The entityName for the entity to be updated
- * @param entity a detached entity instance
- */
- public void update(String entityName, Object entity);
-
- /**
- * Delete a row.
- *
- * @param entity a detached entity instance
- */
- public void delete(Object entity);
-
- /**
- * Delete a row.
- *
- * @param entityName The entityName for the entity to be deleted
- * @param entity a detached entity instance
- */
- public void delete(String entityName, Object entity);
-
- /**
- * Retrieve a row.
- *
- * @return a detached entity instance
- */
- public Object get(String entityName, Serializable id);
-
- /**
- * Retrieve a row.
- *
- * @return a detached entity instance
- */
- public Object get(Class entityClass, Serializable id);
-
- /**
- * Retrieve a row, obtaining the specified lock mode.
- *
- * @return a detached entity instance
- */
- public Object get(String entityName, Serializable id, LockMode lockMode);
-
- /**
- * Retrieve a row, obtaining the specified lock mode.
- *
- * @return a detached entity instance
- */
- public Object get(Class entityClass, Serializable id, LockMode lockMode);
-
- /**
- * Refresh the entity instance state from the database.
- *
- * @param entity The entity to be refreshed.
- */
- public void refresh(Object entity);
-
- /**
- * Refresh the entity instance state from the database.
- *
- * @param entityName The entityName for the entity to be refreshed.
- * @param entity The entity to be refreshed.
- */
- public void refresh(String entityName, Object entity);
-
- /**
- * Refresh the entity instance state from the database.
- *
- * @param entity The entity to be refreshed.
- * @param lockMode The LockMode to be applied.
- */
- public void refresh(Object entity, LockMode lockMode);
-
- /**
- * Refresh the entity instance state from the database.
- *
- * @param entityName The entityName for the entity to be refreshed.
- * @param entity The entity to be refreshed.
- * @param lockMode The LockMode to be applied.
- */
- public void refresh(String entityName, Object entity, LockMode lockMode);
-
- /**
- * Create a new instance of <tt>Query</tt> for the given HQL query string.
- * Entities returned by the query are detached.
- */
- public Query createQuery(String queryString);
-
- /**
- * Obtain an instance of <tt>Query</tt> for a named query string defined in
- * the mapping file. Entities returned by the query are detached.
- */
- public Query getNamedQuery(String queryName);
-
- /**
- * Create a new <tt>Criteria</tt> instance, for the given entity class,
- * or a superclass of an entity class. Entities returned by the query are
- * detached.
- *
- * @param persistentClass a class, which is persistent, or has persistent subclasses
- * @return Criteria
- */
- public Criteria createCriteria(Class persistentClass);
-
- /**
- * Create a new <tt>Criteria</tt> instance, for the given entity class,
- * or a superclass of an entity class, with the given alias.
- * Entities returned by the query are detached.
- *
- * @param persistentClass a class, which is persistent, or has persistent subclasses
- * @return Criteria
- */
- public Criteria createCriteria(Class persistentClass, String alias);
-
- /**
- * Create a new <tt>Criteria</tt> instance, for the given entity name.
- * Entities returned by the query are detached.
- *
- * @param entityName
- * @return Criteria
- */
- public Criteria createCriteria(String entityName);
-
- /**
- * Create a new <tt>Criteria</tt> instance, for the given entity name,
- * with the given alias. Entities returned by the query are detached.
- *
- * @param entityName
- * @return Criteria
- */
- public Criteria createCriteria(String entityName, String alias);
-
- /**
- * Create a new instance of <tt>SQLQuery</tt> for the given SQL query string.
- * Entities returned by the query are detached.
- *
- * @param queryString a SQL query
- * @return SQLQuery
- * @throws HibernateException
- */
- public SQLQuery createSQLQuery(String queryString) throws HibernateException;
-
- /**
- * Begin a Hibernate transaction.
- */
- public Transaction beginTransaction();
-
- /**
- * Get the current Hibernate transaction.
- */
- public Transaction getTransaction();
-
- /**
- * Returns the current JDBC connection associated with this
- * instance.<br>
- * <br>
- * If the session is using aggressive connection release (as in a
- * CMT environment), it is the application's responsibility to
- * close the connection returned by this call. Otherwise, the
- * application should not close the connection.
- */
- public Connection connection();
-}
/trunk/src/org/hibernate/StatelessSession.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/ObjectDeletedException.java
===================================================================
--- trunk/src/org/hibernate/ObjectDeletedException.java (revision 38)
+++ trunk/src/org/hibernate/ObjectDeletedException.java (nonexistent)
@@ -1,48 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat Middleware LLC.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- *
- */
-package org.hibernate;
-
-import java.io.Serializable;
-
-/**
- * Thrown when the user tries to do something illegal with a deleted
- * object.
- *
- * @author Gavin King
- */
-public class ObjectDeletedException extends UnresolvableObjectException {
-
- public ObjectDeletedException(String message, Serializable identifier, String clazz) {
- super(message, identifier, clazz);
- }
-
-}
-
-
-
-
-
-
-
/trunk/src/org/hibernate/ObjectDeletedException.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/PropertyNotFoundException.java
===================================================================
--- trunk/src/org/hibernate/PropertyNotFoundException.java (revision 38)
+++ trunk/src/org/hibernate/PropertyNotFoundException.java (nonexistent)
@@ -1,39 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat Middleware LLC.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- *
- */
-package org.hibernate;
-
-/**
- * Indicates that an expected getter or setter method could not be
- * found on a class.
- *
- * @author Gavin King
- */
-public class PropertyNotFoundException extends MappingException {
-
- public PropertyNotFoundException(String s) {
- super(s);
- }
-
-}
/trunk/src/org/hibernate/PropertyNotFoundException.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/HibernateException.java
===================================================================
--- trunk/src/org/hibernate/HibernateException.java (revision 38)
+++ trunk/src/org/hibernate/HibernateException.java (nonexistent)
@@ -1,57 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat Middleware LLC.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- *
- */
-package org.hibernate;
-
-import org.hibernate.exception.NestableRuntimeException;
-
-/**
- * Any exception that occurs inside the persistence layer
- * or JDBC driver. <tt>SQLException</tt>s are always wrapped
- * by instances of <tt>JDBCException</tt>.
- *
- * @see JDBCException
- * @author Gavin King
- */
-
-public class HibernateException extends NestableRuntimeException {
-
- public HibernateException(Throwable root) {
- super(root);
- }
-
- public HibernateException(String string, Throwable root) {
- super(string, root);
- }
-
- public HibernateException(String s) {
- super(s);
- }
-}
-
-
-
-
-
-
/trunk/src/org/hibernate/HibernateException.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/Session.java
===================================================================
--- trunk/src/org/hibernate/Session.java (revision 38)
+++ trunk/src/org/hibernate/Session.java (nonexistent)
@@ -1,816 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat Middleware LLC.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- *
- */
-package org.hibernate;
-
-import java.io.Serializable;
-import java.sql.Connection;
-
-import org.hibernate.jdbc.Work;
-import org.hibernate.stat.SessionStatistics;
-
-/**
- * The main runtime interface between a Java application and Hibernate. This is the
- * central API class abstracting the notion of a persistence service.<br>
- * <br>
- * The lifecycle of a <tt>Session</tt> is bounded by the beginning and end of a logical
- * transaction. (Long transactions might span several database transactions.)<br>
- * <br>
- * The main function of the <tt>Session</tt> is to offer create, read and delete operations
- * for instances of mapped entity classes. Instances may exist in one of three states:<br>
- * <br>
- * <i>transient:</i> never persistent, not associated with any <tt>Session</tt><br>
- * <i>persistent:</i> associated with a unique <tt>Session</tt><br>
- * <i>detached:</i> previously persistent, not associated with any <tt>Session</tt><br>
- * <br>
- * Transient instances may be made persistent by calling <tt>save()</tt>,
- * <tt>persist()</tt> or <tt>saveOrUpdate()</tt>. Persistent instances may be made transient
- * by calling<tt> delete()</tt>. Any instance returned by a <tt>get()</tt> or
- * <tt>load()</tt> method is persistent. Detached instances may be made persistent
- * by calling <tt>update()</tt>, <tt>saveOrUpdate()</tt>, <tt>lock()</tt> or <tt>replicate()</tt>.
- * The state of a transient or detached instance may also be made persistent as a new
- * persistent instance by calling <tt>merge()</tt>.<br>
- * <br>
- * <tt>save()</tt> and <tt>persist()</tt> result in an SQL <tt>INSERT</tt>, <tt>delete()</tt>
- * in an SQL <tt>DELETE</tt> and <tt>update()</tt> or <tt>merge()</tt> in an SQL <tt>UPDATE</tt>.
- * Changes to <i>persistent</i> instances are detected at flush time and also result in an SQL
- * <tt>UPDATE</tt>. <tt>saveOrUpdate()</tt> and <tt>replicate()</tt> result in either an
- * <tt>INSERT</tt> or an <tt>UPDATE</tt>.<br>
- * <br>
- * It is not intended that implementors be threadsafe. Instead each thread/transaction
- * should obtain its own instance from a <tt>SessionFactory</tt>.<br>
- * <br>
- * A <tt>Session</tt> instance is serializable if its persistent classes are serializable.<br>
- * <br>
- * A typical transaction should use the following idiom:
- * <pre>
- * Session sess = factory.openSession();
- * Transaction tx;
- * try {
- * tx = sess.beginTransaction();
- * //do some work
- * ...
- * tx.commit();
- * }
- * catch (Exception e) {
- * if (tx!=null) tx.rollback();
- * throw e;
- * }
- * finally {
- * sess.close();
- * }
- * </pre>
- * <br>
- * If the <tt>Session</tt> throws an exception, the transaction must be rolled back
- * and the session discarded. The internal state of the <tt>Session</tt> might not
- * be consistent with the database after the exception occurs.
- *
- * @see SessionFactory
- * @author Gavin King
- */
-public interface Session extends Serializable {
-
- /**
- * Retrieve the entity mode in effect for this session.
- *
- * @return The entity mode for this session.
- */
- public EntityMode getEntityMode();
-
- /**
- * Starts a new Session with the given entity mode in effect. This secondary
- * Session inherits the connection, transaction, and other context
- * information from the primary Session. It doesn't need to be flushed
- * or closed by the developer.
- *
- * @param entityMode The entity mode to use for the new session.
- * @return The new session
- */
- public Session getSession(EntityMode entityMode);
-
- /**
- * Force this session to flush. Must be called at the end of a
- * unit of work, before commiting the transaction and closing the
- * session (depending on {@link #setFlushMode flush-mode},
- * {@link Transaction#commit()} calls this method).
- * <p/>
- * <i>Flushing</i> is the process of synchronizing the underlying persistent
- * store with persistable state held in memory.
- *
- * @throws HibernateException Indicates problems flushing the session or
- * talking to the database.
- */
- public void flush() throws HibernateException;
-
- /**
- * Set the flush mode for this session.
- * <p/>
- * The flush mode determines the points at which the session is flushed.
- * <i>Flushing</i> is the process of synchronizing the underlying persistent
- * store with persistable state held in memory.
- * <p/>
- * For a logically "read only" session, it is reasonable to set the session's
- * flush mode to {@link FlushMode#MANUAL} at the start of the session (in
- * order to achieve some extra performance).
- *
- * @param flushMode the new flush mode
- * @see FlushMode
- */
- public void setFlushMode(FlushMode flushMode);
-
- /**
- * Get the current flush mode for this session.
- *
- * @return The flush mode
- */
- public FlushMode getFlushMode();
-
- /**
- * Set the cache mode.
- * <p/>
- * Cache mode determines the manner in which this session can interact with
- * the second level cache.
- *
- * @param cacheMode The new cache mode.
- */
- public void setCacheMode(CacheMode cacheMode);
-
- /**
- * Get the current cache mode.
- *
- * @return The current cache mode.
- */
- public CacheMode getCacheMode();
-
- /**
- * Get the session factory which created this session.
- *
- * @return The session factory.
- * @see SessionFactory
-
- */
- public SessionFactory getSessionFactory();
-
- /**
- * Get the JDBC connection of this Session.<br>
- * <br>
- * If the session is using aggressive collection release (as in a
- * CMT environment), it is the application's responsibility to
- * close the connection returned by this call. Otherwise, the
- * application should not close the connection.
- *
- * @return the JDBC connection in use by the <tt>Session</tt>
- * @throws HibernateException if the <tt>Session</tt> is disconnected
- * @deprecated (scheduled for removal in 4.x). Replacement depends on need; for doing direct JDBC stuff use
- * {@link #doWork}; for opening a 'temporary Session' use (TBD).
- */
- public Connection connection() throws HibernateException;
-
- /**
- * End the session by releasing the JDBC connection and cleaning up. It is
- * not strictly necessary to close the session but you must at least
- * {@link #disconnect()} it.
- *
- * @return the connection provided by the application or null.
- * @throws HibernateException Indicates problems cleaning up.
- */
- public Connection close() throws HibernateException;
-
- /**
- * Cancel the execution of the current query.
- * <p/>
- * This is the sole method on session which may be safely called from
- * another thread.
- *
- * @throws HibernateException There was a problem canceling the query
- */
- public void cancelQuery() throws HibernateException;
-
- /**
- * Check if the session is still open.
- *
- * @return boolean
- */
- public boolean isOpen();
-
- /**
- * Check if the session is currently connected.
- *
- * @return boolean
- */
- public boolean isConnected();
-
- /**
- * Does this session contain any changes which must be synchronized with
- * the database? In other words, would any DML operations be executed if
- * we flushed this session?
- *
- * @return True if the session contains pending changes; false otherwise.
- * @throws HibernateException could not perform dirtying checking
- */
- public boolean isDirty() throws HibernateException;
-
- /**
- * Return the identifier value of the given entity as associated with this
- * session. An exception is thrown if the given entity instance is transient
- * or detached in relation to this session.
- *
- * @param object a persistent instance
- * @return the identifier
- * @throws TransientObjectException if the instance is transient or associated with
- * a different session
- */
- public Serializable getIdentifier(Object object) throws HibernateException;
-
- /**
- * Check if this instance is associated with this <tt>Session</tt>.
- *
- * @param object an instance of a persistent class
- * @return true if the given instance is associated with this <tt>Session</tt>
- */
- public boolean contains(Object object);
-
- /**
- * Remove this instance from the session cache. Changes to the instance will
- * not be synchronized with the database. This operation cascades to associated
- * instances if the association is mapped with <tt>cascade="evict"</tt>.
- *
- * @param object a persistent instance
- * @throws HibernateException
- */
- public void evict(Object object) throws HibernateException;
-
- /**
- * Return the persistent instance of the given entity class with the given identifier,
- * obtaining the specified lock mode, assuming the instance exists.
- *
- * @param theClass a persistent class
- * @param id a valid identifier of an existing persistent instance of the class
- * @param lockMode the lock level
- * @return the persistent instance or proxy
- * @throws HibernateException
- */
- public Object load(Class theClass, Serializable id, LockMode lockMode) throws HibernateException;
-
- /**
- * Return the persistent instance of the given entity class with the given identifier,
- * obtaining the specified lock mode, assuming the instance exists.
- *
- * @param entityName a persistent class
- * @param id a valid identifier of an existing persistent instance of the class
- * @param lockMode the lock level
- * @return the persistent instance or proxy
- * @throws HibernateException
- */
- public Object load(String entityName, Serializable id, LockMode lockMode) throws HibernateException;
-
- /**
- * Return the persistent instance of the given entity class with the given identifier,
- * assuming that the instance exists. This method might return a proxied instance that
- * is initialized on-demand, when a non-identifier method is accessed.
- * <br><br>
- * You should not use this method to determine if an instance exists (use <tt>get()</tt>
- * instead). Use this only to retrieve an instance that you assume exists, where non-existence
- * would be an actual error.
- *
- * @param theClass a persistent class
- * @param id a valid identifier of an existing persistent instance of the class
- * @return the persistent instance or proxy
- * @throws HibernateException
- */
- public Object load(Class theClass, Serializable id) throws HibernateException;
-
- /**
- * Return the persistent instance of the given entity class with the given identifier,
- * assuming that the instance exists. This method might return a proxied instance that
- * is initialized on-demand, when a non-identifier method is accessed.
- * <br><br>
- * You should not use this method to determine if an instance exists (use <tt>get()</tt>
- * instead). Use this only to retrieve an instance that you assume exists, where non-existence
- * would be an actual error.
- *
- * @param entityName a persistent class
- * @param id a valid identifier of an existing persistent instance of the class
- * @return the persistent instance or proxy
- * @throws HibernateException
- */
- public Object load(String entityName, Serializable id) throws HibernateException;
-
- /**
- * Read the persistent state associated with the given identifier into the given transient
- * instance.
- *
- * @param object an "empty" instance of the persistent class
- * @param id a valid identifier of an existing persistent instance of the class
- * @throws HibernateException
- */
- public void load(Object object, Serializable id) throws HibernateException;
-
- /**
- * Persist the state of the given detached instance, reusing the current
- * identifier value. This operation cascades to associated instances if
- * the association is mapped with <tt>cascade="replicate"</tt>.
- *
- * @param object a detached instance of a persistent class
- */
- public void replicate(Object object, ReplicationMode replicationMode) throws HibernateException;
-
- /**
- * Persist the state of the given detached instance, reusing the current
- * identifier value. This operation cascades to associated instances if
- * the association is mapped with <tt>cascade="replicate"</tt>.
- *
- * @param object a detached instance of a persistent class
- */
- public void replicate(String entityName, Object object, ReplicationMode replicationMode) throws HibernateException;
-
- /**
- * Persist the given transient instance, first assigning a generated identifier. (Or
- * using the current value of the identifier property if the <tt>assigned</tt>
- * generator is used.) This operation cascades to associated instances if the
- * association is mapped with <tt>cascade="save-update"</tt>.
- *
- * @param object a transient instance of a persistent class
- * @return the generated identifier
- * @throws HibernateException
- */
- public Serializable save(Object object) throws HibernateException;
-
- /**
- * Persist the given transient instance, first assigning a generated identifier. (Or
- * using the current value of the identifier property if the <tt>assigned</tt>
- * generator is used.) This operation cascades to associated instances if the
- * association is mapped with <tt>cascade="save-update"</tt>.
- *
- * @param object a transient instance of a persistent class
- * @return the generated identifier
- * @throws HibernateException
- */
- public Serializable save(String entityName, Object object) throws HibernateException;
-
- /**
- * Either {@link #save(Object)} or {@link #update(Object)} the given
- * instance, depending upon resolution of the unsaved-value checks (see the
- * manual for discussion of unsaved-value checking).
- * <p/>
- * This operation cascades to associated instances if the association is mapped
- * with <tt>cascade="save-update"</tt>.
- *
- * @see Session#save(java.lang.Object)
- * @see Session#update(Object object)
- * @param object a transient or detached instance containing new or updated state
- * @throws HibernateException
- */
- public void saveOrUpdate(Object object) throws HibernateException;
-
- /**
- * Either {@link #save(String, Object)} or {@link #update(String, Object)}
- * the given instance, depending upon resolution of the unsaved-value checks
- * (see the manual for discussion of unsaved-value checking).
- * <p/>
- * This operation cascades to associated instances if the association is mapped
- * with <tt>cascade="save-update"</tt>.
- *
- * @see Session#save(String,Object)
- * @see Session#update(String,Object)
- * @param object a transient or detached instance containing new or updated state
- * @throws HibernateException
- */
- public void saveOrUpdate(String entityName, Object object) throws HibernateException;
-
- /**
- * Update the persistent instance with the identifier of the given detached
- * instance. If there is a persistent instance with the same identifier,
- * an exception is thrown. This operation cascades to associated instances
- * if the association is mapped with <tt>cascade="save-update"</tt>.
- *
- * @param object a detached instance containing updated state
- * @throws HibernateException
- */
- public void update(Object object) throws HibernateException;
-
- /**
- * Update the persistent instance with the identifier of the given detached
- * instance. If there is a persistent instance with the same identifier,
- * an exception is thrown. This operation cascades to associated instances
- * if the association is mapped with <tt>cascade="save-update"</tt>.
- *
- * @param object a detached instance containing updated state
- * @throws HibernateException
- */
- public void update(String entityName, Object object) throws HibernateException;
-
- /**
- * Copy the state of the given object onto the persistent object with the same
- * identifier. If there is no persistent instance currently associated with
- * the session, it will be loaded. Return the persistent instance. If the
- * given instance is unsaved, save a copy of and return it as a newly persistent
- * instance. The given instance does not become associated with the session.
- * This operation cascades to associated instances if the association is mapped
- * with <tt>cascade="merge"</tt>.<br>
- * <br>
- * The semantics of this method are defined by JSR-220.
- *
- * @param object a detached instance with state to be copied
- * @return an updated persistent instance
- */
- public Object merge(Object object) throws HibernateException;
-
- /**
- * Copy the state of the given object onto the persistent object with the same
- * identifier. If there is no persistent instance currently associated with
- * the session, it will be loaded. Return the persistent instance. If the
- * given instance is unsaved, save a copy of and return it as a newly persistent
- * instance. The given instance does not become associated with the session.
- * This operation cascades to associated instances if the association is mapped
- * with <tt>cascade="merge"</tt>.<br>
- * <br>
- * The semantics of this method are defined by JSR-220.
- *
- * @param object a detached instance with state to be copied
- * @return an updated persistent instance
- */
- public Object merge(String entityName, Object object) throws HibernateException;
-
- /**
- * Make a transient instance persistent. This operation cascades to associated
- * instances if the association is mapped with <tt>cascade="persist"</tt>.<br>
- * <br>
- * The semantics of this method are defined by JSR-220.
- *
- * @param object a transient instance to be made persistent
- */
- public void persist(Object object) throws HibernateException;
- /**
- * Make a transient instance persistent. This operation cascades to associated
- * instances if the association is mapped with <tt>cascade="persist"</tt>.<br>
- * <br>
- * The semantics of this method are defined by JSR-220.
- *
- * @param object a transient instance to be made persistent
- */
- public void persist(String entityName, Object object) throws HibernateException;
-
- /**
- * Remove a persistent instance from the datastore. The argument may be
- * an instance associated with the receiving <tt>Session</tt> or a transient
- * instance with an identifier associated with existing persistent state.
- * This operation cascades to associated instances if the association is mapped
- * with <tt>cascade="delete"</tt>.
- *
- * @param object the instance to be removed
- * @throws HibernateException
- */
- public void delete(Object object) throws HibernateException;
-
- /**
- * Remove a persistent instance from the datastore. The <b>object</b> argument may be
- * an instance associated with the receiving <tt>Session</tt> or a transient
- * instance with an identifier associated with existing persistent state.
- * This operation cascades to associated instances if the association is mapped
- * with <tt>cascade="delete"</tt>.
- *
- * @param entityName The entity name for the instance to be removed.
- * @param object the instance to be removed
- * @throws HibernateException
- */
- public void delete(String entityName, Object object) throws HibernateException;
-
- /**
- * Obtain the specified lock level upon the given object. This may be used to
- * perform a version check (<tt>LockMode.READ</tt>), to upgrade to a pessimistic
- * lock (<tt>LockMode.UPGRADE</tt>), or to simply reassociate a transient instance
- * with a session (<tt>LockMode.NONE</tt>). This operation cascades to associated
- * instances if the association is mapped with <tt>cascade="lock"</tt>.
- *
- * @param object a persistent or transient instance
- * @param lockMode the lock level
- * @throws HibernateException
- */
- public void lock(Object object, LockMode lockMode) throws HibernateException;
-
- /**
- * Obtain the specified lock level upon the given object. This may be used to
- * perform a version check (<tt>LockMode.READ</tt>), to upgrade to a pessimistic
- * lock (<tt>LockMode.UPGRADE</tt>), or to simply reassociate a transient instance
- * with a session (<tt>LockMode.NONE</tt>). This operation cascades to associated
- * instances if the association is mapped with <tt>cascade="lock"</tt>.
- *
- * @param object a persistent or transient instance
- * @param lockMode the lock level
- * @throws HibernateException
- */
- public void lock(String entityName, Object object, LockMode lockMode) throws HibernateException;
-
- /**
- * Re-read the state of the given instance from the underlying database. It is
- * inadvisable to use this to implement long-running sessions that span many
- * business tasks. This method is, however, useful in certain special circumstances.
- * For example
- * <ul>
- * <li>where a database trigger alters the object state upon insert or update
- * <li>after executing direct SQL (eg. a mass update) in the same session
- * <li>after inserting a <tt>Blob</tt> or <tt>Clob</tt>
- * </ul>
- *
- * @param object a persistent or detached instance
- * @throws HibernateException
- */
- public void refresh(Object object) throws HibernateException;
-
- /**
- * Re-read the state of the given instance from the underlying database, with
- * the given <tt>LockMode</tt>. It is inadvisable to use this to implement
- * long-running sessions that span many business tasks. This method is, however,
- * useful in certain special circumstances.
- *
- * @param object a persistent or detached instance
- * @param lockMode the lock mode to use
- * @throws HibernateException
- */
- public void refresh(Object object, LockMode lockMode) throws HibernateException;
-
- /**
- * Determine the current lock mode of the given object.
- *
- * @param object a persistent instance
- * @return the current lock mode
- * @throws HibernateException
- */
- public LockMode getCurrentLockMode(Object object) throws HibernateException;
-
- /**
- * Begin a unit of work and return the associated <tt>Transaction</tt> object.
- * If a new underlying transaction is required, begin the transaction. Otherwise
- * continue the new work in the context of the existing underlying transaction.
- * The class of the returned <tt>Transaction</tt> object is determined by the
- * property <tt>hibernate.transaction_factory</tt>.
- *
- * @return a Transaction instance
- * @throws HibernateException
- * @see Transaction
- */
- public Transaction beginTransaction() throws HibernateException;
-
- /**
- * Get the <tt>Transaction</tt> instance associated with this session.
- * The class of the returned <tt>Transaction</tt> object is determined by the
- * property <tt>hibernate.transaction_factory</tt>.
- *
- * @return a Transaction instance
- * @throws HibernateException
- * @see Transaction
- */
- public Transaction getTransaction();
-
- /**
- * Create a new <tt>Criteria</tt> instance, for the given entity class,
- * or a superclass of an entity class.
- *
- * @param persistentClass a class, which is persistent, or has persistent subclasses
- * @return Criteria
- */
- public Criteria createCriteria(Class persistentClass);
-
- /**
- * Create a new <tt>Criteria</tt> instance, for the given entity class,
- * or a superclass of an entity class, with the given alias.
- *
- * @param persistentClass a class, which is persistent, or has persistent subclasses
- * @return Criteria
- */
- public Criteria createCriteria(Class persistentClass, String alias);
-
- /**
- * Create a new <tt>Criteria</tt> instance, for the given entity name.
- *
- * @param entityName
- * @return Criteria
- */
- public Criteria createCriteria(String entityName);
-
- /**
- * Create a new <tt>Criteria</tt> instance, for the given entity name,
- * with the given alias.
- *
- * @param entityName
- * @return Criteria
- */
- public Criteria createCriteria(String entityName, String alias);
-
- /**
- * Create a new instance of <tt>Query</tt> for the given HQL query string.
- *
- * @param queryString a HQL query
- * @return Query
- * @throws HibernateException
- */
- public Query createQuery(String queryString) throws HibernateException;
-
- /**
- * Create a new instance of <tt>SQLQuery</tt> for the given SQL query string.
- *
- * @param queryString a SQL query
- * @return SQLQuery
- * @throws HibernateException
- */
- public SQLQuery createSQLQuery(String queryString) throws HibernateException;
-
- /**
- * Create a new instance of <tt>Query</tt> for the given collection and filter string.
- *
- * @param collection a persistent collection
- * @param queryString a Hibernate query
- * @return Query
- * @throws HibernateException
- */
- public Query createFilter(Object collection, String queryString) throws HibernateException;
-
- /**
- * Obtain an instance of <tt>Query</tt> for a named query string defined in the
- * mapping file.
- *
- * @param queryName the name of a query defined externally
- * @return Query
- * @throws HibernateException
- */
- public Query getNamedQuery(String queryName) throws HibernateException;
-
- /**
- * Completely clear the session. Evict all loaded instances and cancel all pending
- * saves, updates and deletions. Do not close open iterators or instances of
- * <tt>ScrollableResults</tt>.
- */
- public void clear();
-
- /**
- * Return the persistent instance of the given entity class with the given identifier,
- * or null if there is no such persistent instance. (If the instance is already associated
- * with the session, return that instance. This method never returns an uninitialized instance.)
- * Obtain the specified lock mode if the instance exists.
- *
- * @param clazz a persistent class
- * @param id an identifier
- * @return a persistent instance or null
- * @throws HibernateException
- */
- public Object get(Class clazz, Serializable id) throws HibernateException;
-
- /**
- * Return the persistent instance of the given entity class with the given identifier,
- * or null if there is no such persistent instance. (If the instance is already associated
- * with the session, return that instance. This method never returns an uninitialized instance.)
- * Obtain the specified lock mode if the instance exists.
- *
- * @param clazz a persistent class
- * @param id an identifier
- * @param lockMode the lock mode
- * @return a persistent instance or null
- * @throws HibernateException
- */
- public Object get(Class clazz, Serializable id, LockMode lockMode) throws HibernateException;
-
- /**
- * Return the persistent instance of the given named entity with the given identifier,
- * or null if there is no such persistent instance. (If the instance is already associated
- * with the session, return that instance. This method never returns an uninitialized instance.)
- *
- * @param entityName the entity name
- * @param id an identifier
- * @return a persistent instance or null
- * @throws HibernateException
- */
- public Object get(String entityName, Serializable id) throws HibernateException;
-
- /**
- * Return the persistent instance of the given entity class with the given identifier,
- * or null if there is no such persistent instance. (If the instance is already associated
- * with the session, return that instance. This method never returns an uninitialized instance.)
- * Obtain the specified lock mode if the instance exists.
- *
- * @param entityName the entity name
- * @param id an identifier
- * @param lockMode the lock mode
- * @return a persistent instance or null
- * @throws HibernateException
- */
- public Object get(String entityName, Serializable id, LockMode lockMode) throws HibernateException;
-
-
- /**
- * Return the entity name for a persistent entity
- *
- * @param object a persistent entity
- * @return the entity name
- * @throws HibernateException
- */
- public String getEntityName(Object object) throws HibernateException;
-
- /**
- * Enable the named filter for this current session.
- *
- * @param filterName The name of the filter to be enabled.
- * @return The Filter instance representing the enabled fiter.
- */
- public Filter enableFilter(String filterName);
-
- /**
- * Retrieve a currently enabled filter by name.
- *
- * @param filterName The name of the filter to be retrieved.
- * @return The Filter instance representing the enabled fiter.
- */
- public Filter getEnabledFilter(String filterName);
-
- /**
- * Disable the named filter for the current session.
- *
- * @param filterName The name of the filter to be disabled.
- */
- public void disableFilter(String filterName);
-
- /**
- * Get the statistics for this session.
- */
- public SessionStatistics getStatistics();
-
- /**
- * Set an unmodified persistent object to read only mode, or a read only
- * object to modifiable mode. In read only mode, no snapshot is maintained
- * and the instance is never dirty checked.
- *
- * @see Query#setReadOnly(boolean)
- */
- public void setReadOnly(Object entity, boolean readOnly);
-
- /**
- * Controller for allowing users to perform JDBC related work using the Connection
- * managed by this Session.
- *
- * @param work The work to be performed.
- * @throws HibernateException Generally indicates wrapped {@link java.sql.SQLException}
- */
- public void doWork(Work work) throws HibernateException;
-
-
- /**
- * Disconnect the <tt>Session</tt> from the current JDBC connection. If
- * the connection was obtained by Hibernate close it and return it to
- * the connection pool; otherwise, return it to the application.
- * <p/>
- * This is used by applications which supply JDBC connections to Hibernate
- * and which require long-sessions (or long-conversations)
- * <p/>
- * Note that disconnect() called on a session where the connection was
- * retrieved by Hibernate through its configured
- * {@link org.hibernate.connection.ConnectionProvider} has no effect,
- * provided {@link ConnectionReleaseMode#ON_CLOSE} is not in effect.
- *
- * @return the application-supplied connection or <tt>null</tt>
- * @see #reconnect(Connection)
- * @see #reconnect()
- */
- Connection disconnect() throws HibernateException;
-
- /**
- * Obtain a new JDBC connection. This is used by applications which
- * require long transactions and do not supply connections to the
- * session.
- *
- * @see #disconnect()
- * @deprecated Manual reconnection is only needed in the case of
- * application-supplied connections, in which case the
- * {@link #reconnect(java.sql.Connection)} for should be used.
- */
- void reconnect() throws HibernateException;
-
- /**
- * Reconnect to the given JDBC connection. This is used by applications
- * which require long transactions and use application-supplied connections.
- *
- * @param connection a JDBC connection
- * @see #disconnect()
- */
- void reconnect(Connection connection) throws HibernateException;
-}
/trunk/src/org/hibernate/Session.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/SessionFactoryObserver.java
===================================================================
--- trunk/src/org/hibernate/SessionFactoryObserver.java (revision 38)
+++ trunk/src/org/hibernate/SessionFactoryObserver.java (nonexistent)
@@ -1,49 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat Middleware LLC.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- *
- */
-package org.hibernate;
-
-import java.io.Serializable;
-
-/**
- * Allows reaction to basic {@link SessionFactory} occurrences.
- *
- * @author Steve Ebersole
- */
-public interface SessionFactoryObserver extends Serializable {
- /**
- * Callback to indicate that the given factory has been created and is now ready for use.
- *
- * @param factory The factory initialized.
- */
- public void sessionFactoryCreated(SessionFactory factory);
-
- /**
- * Callback to indicate that the given factory has been closed. Care should be taken
- * in how (if at all) the passed factory reference is used since it is closed.
- *
- * @param factory The factory closed.
- */
- public void sessionFactoryClosed(SessionFactory factory);
-}
/trunk/src/org/hibernate/SessionFactoryObserver.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/Transaction.java
===================================================================
--- trunk/src/org/hibernate/Transaction.java (revision 38)
+++ trunk/src/org/hibernate/Transaction.java (nonexistent)
@@ -1,128 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat Middleware LLC.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- *
- */
-package org.hibernate;
-
-import javax.transaction.Synchronization;
-
-/**
- * Allows the application to define units of work, while
- * maintaining abstraction from the underlying transaction
- * implementation (eg. JTA, JDBC).<br>
- * <br>
- * A transaction is associated with a <tt>Session</tt> and is
- * usually instantiated by a call to <tt>Session.beginTransaction()</tt>.
- * A single session might span multiple transactions since
- * the notion of a session (a conversation between the application
- * and the datastore) is of coarser granularity than the notion of
- * a transaction. However, it is intended that there be at most one
- * uncommitted <tt>Transaction</tt> associated with a particular
- * <tt>Session</tt> at any time.<br>
- * <br>
- * Implementors are not intended to be threadsafe.
- *
- * @see Session#beginTransaction()
- * @see org.hibernate.transaction.TransactionFactory
- * @author Anton van Straaten
- */
-public interface Transaction {
-
- /**
- * Begin a new transaction.
- */
- public void begin() throws HibernateException;
-
- /**
- * Flush the associated <tt>Session</tt> and end the unit of work (unless
- * we are in {@link FlushMode#MANUAL}.
- * </p>
- * This method will commit the underlying transaction if and only
- * if the underlying transaction was initiated by this object.
- *
- * @throws HibernateException
- */
- public void commit() throws HibernateException;
-
- /**
- * Force the underlying transaction to roll back.
- *
- * @throws HibernateException
- */
- public void rollback() throws HibernateException;
-
- /**
- * Was this transaction rolled back or set to rollback only?
- * <p/>
- * This only accounts for actions initiated from this local transaction.
- * If, for example, the underlying transaction is forced to rollback via
- * some other means, this method still reports false because the rollback
- * was not initiated from here.
- *
- * @return boolean True if the transaction was rolled back via this
- * local transaction; false otherwise.
- * @throws HibernateException
- */
- public boolean wasRolledBack() throws HibernateException;
-
- /**
- * Check if this transaction was successfully committed.
- * <p/>
- * This method could return <tt>false</tt> even after successful invocation
- * of {@link #commit}. As an example, JTA based strategies no-op on
- * {@link #commit} calls if they did not start the transaction; in that case,
- * they also report {@link #wasCommitted} as false.
- *
- * @return boolean True if the transaction was (unequivocally) committed
- * via this local transaction; false otherwise.
- * @throws HibernateException
- */
- public boolean wasCommitted() throws HibernateException;
-
- /**
- * Is this transaction still active?
- * <p/>
- * Again, this only returns information in relation to the
- * local transaction, not the actual underlying transaction.
- *
- * @return boolean Treu if this local transaction is still active.
- */
- public boolean isActive() throws HibernateException;
-
- /**
- * Register a user synchronization callback for this transaction.
- *
- * @param synchronization The Synchronization callback to register.
- * @throws HibernateException
- */
- public void registerSynchronization(Synchronization synchronization)
- throws HibernateException;
-
- /**
- * Set the transaction timeout for any transaction started by
- * a subsequent call to <tt>begin()</tt> on this instance.
- *
- * @param seconds The number of seconds before a timeout.
- */
- public void setTimeout(int seconds);
-}
/trunk/src/org/hibernate/Transaction.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/Interceptor.java
===================================================================
--- trunk/src/org/hibernate/Interceptor.java (revision 38)
+++ trunk/src/org/hibernate/Interceptor.java (nonexistent)
@@ -1,178 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat Middleware LLC.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- *
- */
-package org.hibernate;
-
-import java.io.Serializable;
-import java.util.Iterator;
-
-import org.hibernate.type.Type;
-
-/**
- * Allows user code to inspect and/or change property values.
- * <br><br>
- * Inspection occurs before property values are written and after they are read
- * from the database.<br>
- * <br>
- * There might be a single instance of <tt>Interceptor</tt> for a <tt>SessionFactory</tt>, or a new instance
- * might be specified for each <tt>Session</tt>. Whichever approach is used, the interceptor must be
- * serializable if the <tt>Session</tt> is to be serializable. This means that <tt>SessionFactory</tt>-scoped
- * interceptors should implement <tt>readResolve()</tt>.<br>
- * <br>
- * The <tt>Session</tt> may not be invoked from a callback (nor may a callback cause a collection or proxy to
- * be lazily initialized).<br>
- * <br>
- * Instead of implementing this interface directly, it is usually better to extend <tt>EmptyInterceptor</tt>
- * and override only the callback methods of interest.
- *
- * @see SessionFactory#openSession(Interceptor)
- * @see org.hibernate.cfg.Configuration#setInterceptor(Interceptor)
- * @see EmptyInterceptor
- * @author Gavin King
- */
-public interface Interceptor {
- /**
- * Called just before an object is initialized. The interceptor may change the <tt>state</tt>, which will
- * be propagated to the persistent object. Note that when this method is called, <tt>entity</tt> will be
- * an empty uninitialized instance of the class.
- *
- * @return <tt>true</tt> if the user modified the <tt>state</tt> in any way.
- */
- public boolean onLoad(Object entity, Serializable id, Object[] state, String[] propertyNames, Type[] types) throws CallbackException;
- /**
- * Called when an object is detected to be dirty, during a flush. The interceptor may modify the detected
- * <tt>currentState</tt>, which will be propagated to both the database and the persistent object.
- * Note that not all flushes end in actual synchronization with the database, in which case the
- * new <tt>currentState</tt> will be propagated to the object, but not necessarily (immediately) to
- * the database. It is strongly recommended that the interceptor <b>not</b> modify the <tt>previousState</tt>.
- *
- * @return <tt>true</tt> if the user modified the <tt>currentState</tt> in any way.
- */
- public boolean onFlushDirty(Object entity, Serializable id, Object[] currentState, Object[] previousState, String[] propertyNames, Type[] types) throws CallbackException;
- /**
- * Called before an object is saved. The interceptor may modify the <tt>state</tt>, which will be used for
- * the SQL <tt>INSERT</tt> and propagated to the persistent object.
- *
- * @return <tt>true</tt> if the user modified the <tt>state</tt> in any way.
- */
- public boolean onSave(Object entity, Serializable id, Object[] state, String[] propertyNames, Type[] types) throws CallbackException;
- /**
- * Called before an object is deleted. It is not recommended that the interceptor modify the <tt>state</tt>.
- */
- public void onDelete(Object entity, Serializable id, Object[] state, String[] propertyNames, Type[] types) throws CallbackException;
- /**
- * Called before a collection is (re)created.
- */
- public void onCollectionRecreate(Object collection, Serializable key) throws CallbackException;
- /**
- * Called before a collection is deleted.
- */
- public void onCollectionRemove(Object collection, Serializable key) throws CallbackException;
- /**
- * Called before a collection is updated.
- */
- public void onCollectionUpdate(Object collection, Serializable key) throws CallbackException;
- /**
- * Called before a flush
- */
- public void preFlush(Iterator entities) throws CallbackException;
- /**
- * Called after a flush that actually ends in execution of the SQL statements required to synchronize
- * in-memory state with the database.
- */
- public void postFlush(Iterator entities) throws CallbackException;
- /**
- * Called to distinguish between transient and detached entities. The return value determines the
- * state of the entity with respect to the current session.
- * <ul>
- * <li><tt>Boolean.TRUE</tt> - the entity is transient
- * <li><tt>Boolean.FALSE</tt> - the entity is detached
- * <li><tt>null</tt> - Hibernate uses the <tt>unsaved-value</tt> mapping and other heuristics to
- * determine if the object is unsaved
- * </ul>
- * @param entity a transient or detached entity
- * @return Boolean or <tt>null</tt> to choose default behaviour
- */
- public Boolean isTransient(Object entity);
- /**
- * Called from <tt>flush()</tt>. The return value determines whether the entity is updated
- * <ul>
- * <li>an array of property indices - the entity is dirty
- * <li>an empty array - the entity is not dirty
- * <li><tt>null</tt> - use Hibernate's default dirty-checking algorithm
- * </ul>
- * @param entity a persistent entity
- * @return array of dirty property indices or <tt>null</tt> to choose default behaviour
- */
- public int[] findDirty(Object entity, Serializable id, Object[] currentState, Object[] previousState, String[] propertyNames, Type[] types);
- /**
- * Instantiate the entity class. Return <tt>null</tt> to indicate that Hibernate should use
- * the default constructor of the class. The identifier property of the returned instance
- * should be initialized with the given identifier.
- *
- * @param entityName the name of the entity
- * @param entityMode The type of entity instance to be returned.
- * @param id the identifier of the new instance
- * @return an instance of the class, or <tt>null</tt> to choose default behaviour
- */
- public Object instantiate(String entityName, EntityMode entityMode, Serializable id) throws CallbackException;
-
- /**
- * Get the entity name for a persistent or transient instance
- * @param object an entity instance
- * @return the name of the entity
- */
- public String getEntityName(Object object) throws CallbackException;
-
- /**
- * Get a fully loaded entity instance that is cached externally
- * @param entityName the name of the entity
- * @param id the instance identifier
- * @return a fully initialized entity
- * @throws CallbackException
- */
- public Object getEntity(String entityName, Serializable id) throws CallbackException;
-
- /**
- * Called when a Hibernate transaction is begun via the Hibernate <tt>Transaction</tt>
- * API. Will not be called if transactions are being controlled via some other
- * mechanism (CMT, for example).
- */
- public void afterTransactionBegin(Transaction tx);
- /**
- * Called before a transaction is committed (but not before rollback).
- */
- public void beforeTransactionCompletion(Transaction tx);
- /**
- * Called after a transaction is committed or rolled back.
- */
- public void afterTransactionCompletion(Transaction tx);
-
- /**
- * Called when sql string is being prepared.
- * @param sql sql to be prepared
- * @return original or modified sql
- */
- public String onPrepareStatement(String sql);
-}
/trunk/src/org/hibernate/Interceptor.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/WrongClassException.java
===================================================================
--- trunk/src/org/hibernate/WrongClassException.java (revision 38)
+++ trunk/src/org/hibernate/WrongClassException.java (nonexistent)
@@ -1,70 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat Middleware LLC.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- *
- */
-package org.hibernate;
-
-import java.io.Serializable;
-
-/**
- * Thrown when <tt>Session.load()</tt> selects a row with
- * the given primary key (identifier value) but the row's
- * discriminator value specifies a subclass that is not
- * assignable to the class requested by the user.
- *
- * @author Gavin King
- */
-public class WrongClassException extends HibernateException {
-
- private final Serializable identifier;
- private final String entityName;
-
- public WrongClassException(String msg, Serializable identifier, String clazz) {
- super(msg);
- this.identifier = identifier;
- this.entityName = clazz;
- }
- public Serializable getIdentifier() {
- return identifier;
- }
-
- public String getMessage() {
- return "Object with id: " +
- identifier +
- " was not of the specified subclass: " +
- entityName +
- " (" + super.getMessage() + ")" ;
- }
-
- public String getEntityName() {
- return entityName;
- }
-
-}
-
-
-
-
-
-
-
/trunk/src/org/hibernate/WrongClassException.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/Hibernate.java
===================================================================
--- trunk/src/org/hibernate/Hibernate.java (revision 38)
+++ trunk/src/org/hibernate/Hibernate.java (nonexistent)
@@ -1,477 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat Middleware LLC.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- *
- */
-package org.hibernate;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Reader;
-import java.io.Serializable;
-import java.sql.Blob;
-import java.sql.Clob;
-import java.util.Iterator;
-import java.util.Properties;
-
-import org.hibernate.collection.PersistentCollection;
-import org.hibernate.engine.HibernateIterator;
-import org.hibernate.intercept.FieldInterceptionHelper;
-import org.hibernate.intercept.FieldInterceptor;
-import org.hibernate.lob.BlobImpl;
-import org.hibernate.lob.ClobImpl;
-import org.hibernate.lob.SerializableBlob;
-import org.hibernate.lob.SerializableClob;
-import org.hibernate.proxy.HibernateProxy;
-import org.hibernate.proxy.LazyInitializer;
-import org.hibernate.type.AnyType;
-import org.hibernate.type.BigDecimalType;
-import org.hibernate.type.BigIntegerType;
-import org.hibernate.type.BinaryType;
-import org.hibernate.type.BlobType;
-import org.hibernate.type.BooleanType;
-import org.hibernate.type.ByteType;
-import org.hibernate.type.CalendarDateType;
-import org.hibernate.type.CalendarType;
-import org.hibernate.type.CharacterType;
-import org.hibernate.type.ClassType;
-import org.hibernate.type.ClobType;
-import org.hibernate.type.CompositeCustomType;
-import org.hibernate.type.CurrencyType;
-import org.hibernate.type.CustomType;
-import org.hibernate.type.DateType;
-import org.hibernate.type.DoubleType;
-import org.hibernate.type.FloatType;
-import org.hibernate.type.IntegerType;
-import org.hibernate.type.LocaleType;
-import org.hibernate.type.LongType;
-import org.hibernate.type.ManyToOneType;
-import org.hibernate.type.NullableType;
-import org.hibernate.type.SerializableType;
-import org.hibernate.type.ShortType;
-import org.hibernate.type.StringType;
-import org.hibernate.type.TextType;
-import org.hibernate.type.TimeType;
-import org.hibernate.type.TimeZoneType;
-import org.hibernate.type.TimestampType;
-import org.hibernate.type.TrueFalseType;
-import org.hibernate.type.Type;
-import org.hibernate.type.YesNoType;
-import org.hibernate.type.CharArrayType;
-import org.hibernate.type.WrapperBinaryType;
-import org.hibernate.type.CharacterArrayType;
-import org.hibernate.usertype.CompositeUserType;
-
-/**
- * <ul>
- * <li>Provides access to the full range of Hibernate built-in types. <tt>Type</tt>
- * instances may be used to bind values to query parameters.
- * <li>A factory for new <tt>Blob</tt>s and <tt>Clob</tt>s.
- * <li>Defines static methods for manipulation of proxies.
- * </ul>
- *
- * @author Gavin King
- * @see java.sql.Clob
- * @see java.sql.Blob
- * @see org.hibernate.type.Type
- */
-
-public final class Hibernate {
-
- /**
- * Hibernate <tt>long</tt> type.
- */
- public static final NullableType LONG = new LongType();
- /**
- * Hibernate <tt>short</tt> type.
- */
- public static final NullableType SHORT = new ShortType();
- /**
- * Hibernate <tt>integer</tt> type.
- */
- public static final NullableType INTEGER = new IntegerType();
- /**
- * Hibernate <tt>byte</tt> type.
- */
- public static final NullableType BYTE = new ByteType();
- /**
- * Hibernate <tt>float</tt> type.
- */
- public static final NullableType FLOAT = new FloatType();
- /**
- * Hibernate <tt>double</tt> type.
- */
- public static final NullableType DOUBLE = new DoubleType();
- /**
- * Hibernate <tt>character</tt> type.
- */
- public static final NullableType CHARACTER = new CharacterType();
- /**
- * Hibernate <tt>string</tt> type.
- */
- public static final NullableType STRING = new StringType();
- /**
- * Hibernate <tt>time</tt> type.
- */
- public static final NullableType TIME = new TimeType();
- /**
- * Hibernate <tt>date</tt> type.
- */
- public static final NullableType DATE = new DateType();
- /**
- * Hibernate <tt>timestamp</tt> type.
- */
- public static final NullableType TIMESTAMP = new TimestampType();
- /**
- * Hibernate <tt>boolean</tt> type.
- */
- public static final NullableType BOOLEAN = new BooleanType();
- /**
- * Hibernate <tt>true_false</tt> type.
- */
- public static final NullableType TRUE_FALSE = new TrueFalseType();
- /**
- * Hibernate <tt>yes_no</tt> type.
- */
- public static final NullableType YES_NO = new YesNoType();
- /**
- * Hibernate <tt>big_decimal</tt> type.
- */
- public static final NullableType BIG_DECIMAL = new BigDecimalType();
- /**
- * Hibernate <tt>big_integer</tt> type.
- */
- public static final NullableType BIG_INTEGER = new BigIntegerType();
- /**
- * Hibernate <tt>binary</tt> type.
- */
- public static final NullableType BINARY = new BinaryType();
- /**
- * Hibernate <tt>wrapper-binary</tt> type.
- */
- public static final NullableType WRAPPER_BINARY = new WrapperBinaryType();
- /**
- * Hibernate char[] type.
- */
- public static final NullableType CHAR_ARRAY = new CharArrayType();
- /**
- * Hibernate Character[] type.
- */
- public static final NullableType CHARACTER_ARRAY = new CharacterArrayType();
- /**
- * Hibernate <tt>text</tt> type.
- */
- public static final NullableType TEXT = new TextType();
- /**
- * Hibernate <tt>blob</tt> type.
- */
- public static final Type BLOB = new BlobType();
- /**
- * Hibernate <tt>clob</tt> type.
- */
- public static final Type CLOB = new ClobType();
- /**
- * Hibernate <tt>calendar</tt> type.
- */
- public static final NullableType CALENDAR = new CalendarType();
- /**
- * Hibernate <tt>calendar_date</tt> type.
- */
- public static final NullableType CALENDAR_DATE = new CalendarDateType();
- /**
- * Hibernate <tt>locale</tt> type.
- */
- public static final NullableType LOCALE = new LocaleType();
- /**
- * Hibernate <tt>currency</tt> type.
- */
- public static final NullableType CURRENCY = new CurrencyType();
- /**
- * Hibernate <tt>timezone</tt> type.
- */
- public static final NullableType TIMEZONE = new TimeZoneType();
- /**
- * Hibernate <tt>class</tt> type.
- */
- public static final NullableType CLASS = new ClassType();
- /**
- * Hibernate <tt>serializable</tt> type.
- */
- public static final NullableType SERIALIZABLE = new SerializableType( Serializable.class );
- /**
- * Hibernate <tt>object</tt> type.
- */
- public static final Type OBJECT = new AnyType();
-
-
- /**
- * Cannot be instantiated.
- */
- private Hibernate() {
- throw new UnsupportedOperationException();
- }
-
- /**
- * A Hibernate <tt>serializable</tt> type.
- */
- public static Type serializable(Class serializableClass) {
- return new SerializableType( serializableClass );
- }
-
- /**
- * A Hibernate <tt>any</tt> type.
- *
- * @param metaType a type mapping <tt>java.lang.Class</tt> to a single column
- * @param identifierType the entity identifier type
- * @return the Type
- */
- public static Type any(Type metaType, Type identifierType) {
- return new AnyType( metaType, identifierType );
- }
-
- /**
- * A Hibernate persistent object (entity) type.
- *
- * @param persistentClass a mapped entity class
- */
- public static Type entity(Class persistentClass) {
- // not really a many-to-one association *necessarily*
- return new ManyToOneType( persistentClass.getName() );
- }
-
- /**
- * A Hibernate persistent object (entity) type.
- *
- * @param entityName a mapped entity class
- */
- public static Type entity(String entityName) {
- // not really a many-to-one association *necessarily*
- return new ManyToOneType( entityName );
- }
-
- /**
- * A Hibernate custom type.
- *
- * @param userTypeClass a class that implements <tt>UserType</tt>
- */
- public static Type custom(Class userTypeClass) throws HibernateException {
- return custom( userTypeClass, null );
- }
-
- /**
- * A Hibernate parameterizable custom type.
- *
- * @param userTypeClass a class that implements <tt>UserType and ParameterizableType</tt>
- * @param parameterNames the names of the parameters passed to the type
- * @param parameterValues the values of the parameters passed to the type. They must match
- * up with the order and length of the parameterNames array.
- */
- public static Type custom(Class userTypeClass, String[] parameterNames, String[] parameterValues)
- throws HibernateException {
- Properties parameters = new Properties();
- for ( int i = 0; i < parameterNames.length; i++ ) {
- parameters.setProperty( parameterNames[i], parameterValues[i] );
- }
- return custom( userTypeClass, parameters );
- }
-
- /**
- * A Hibernate parameterizable custom type.
- *
- * @param userTypeClass a class that implements <tt>UserType and ParameterizableType</tt>
- * @param parameters the parameters as a collection of name/value pairs
- */
- public static Type custom(Class userTypeClass, Properties parameters)
- throws HibernateException {
- if ( CompositeUserType.class.isAssignableFrom( userTypeClass ) ) {
- CompositeCustomType type = new CompositeCustomType( userTypeClass, parameters );
- return type;
- }
- else {
- CustomType type = new CustomType( userTypeClass, parameters );
- return type;
- }
- }
-
- /**
- * Force initialization of a proxy or persistent collection.
- * <p/>
- * Note: This only ensures intialization of a proxy object or collection;
- * it is not guaranteed that the elements INSIDE the collection will be initialized/materialized.
- *
- * @param proxy a persistable object, proxy, persistent collection or <tt>null</tt>
- * @throws HibernateException if we can't initialize the proxy at this time, eg. the <tt>Session</tt> was closed
- */
- public static void initialize(Object proxy) throws HibernateException {
- if ( proxy == null ) {
- return;
- }
- else if ( proxy instanceof HibernateProxy ) {
- ( ( HibernateProxy ) proxy ).getHibernateLazyInitializer().initialize();
- }
- else if ( proxy instanceof PersistentCollection ) {
- ( ( PersistentCollection ) proxy ).forceInitialization();
- }
- }
-
- /**
- * Check if the proxy or persistent collection is initialized.
- *
- * @param proxy a persistable object, proxy, persistent collection or <tt>null</tt>
- * @return true if the argument is already initialized, or is not a proxy or collection
- */
- public static boolean isInitialized(Object proxy) {
- if ( proxy instanceof HibernateProxy ) {
- return !( ( HibernateProxy ) proxy ).getHibernateLazyInitializer().isUninitialized();
- }
- else if ( proxy instanceof PersistentCollection ) {
- return ( ( PersistentCollection ) proxy ).wasInitialized();
- }
- else {
- return true;
- }
- }
-
- /**
- * Get the true, underlying class of a proxied persistent class. This operation
- * will initialize a proxy by side-effect.
- *
- * @param proxy a persistable object or proxy
- * @return the true class of the instance
- * @throws HibernateException
- */
- public static Class getClass(Object proxy) {
- if ( proxy instanceof HibernateProxy ) {
- return ( ( HibernateProxy ) proxy ).getHibernateLazyInitializer()
- .getImplementation()
- .getClass();
- }
- else {
- return proxy.getClass();
- }
- }
-
- /**
- * Create a new <tt>Blob</tt>. The returned object will be initially immutable.
- *
- * @param bytes a byte array
- * @return the Blob
- */
- public static Blob createBlob(byte[] bytes) {
- return new SerializableBlob( new BlobImpl( bytes ) );
- }
-
- /**
- * Create a new <tt>Blob</tt>. The returned object will be initially immutable.
- *
- * @param stream a binary stream
- * @param length the number of bytes in the stream
- * @return the Blob
- */
- public static Blob createBlob(InputStream stream, int length) {
- return new SerializableBlob( new BlobImpl( stream, length ) );
- }
-
- /**
- * Create a new <tt>Blob</tt>. The returned object will be initially immutable.
- *
- * @param stream a binary stream
- * @return the Blob
- * @throws IOException
- */
- public static Blob createBlob(InputStream stream) throws IOException {
- return new SerializableBlob( new BlobImpl( stream, stream.available() ) );
- }
-
- /**
- * Create a new <tt>Clob</tt>. The returned object will be initially immutable.
- *
- * @param string a <tt>String</tt>
- */
- public static Clob createClob(String string) {
- return new SerializableClob( new ClobImpl( string ) );
- }
-
- /**
- * Create a new <tt>Clob</tt>. The returned object will be initially immutable.
- *
- * @param reader a character stream
- * @param length the number of characters in the stream
- */
- public static Clob createClob(Reader reader, int length) {
- return new SerializableClob( new ClobImpl( reader, length ) );
- }
-
- /**
- * Close an <tt>Iterator</tt> created by <tt>iterate()</tt> immediately,
- * instead of waiting until the session is closed or disconnected.
- *
- * @param iterator an <tt>Iterator</tt> created by <tt>iterate()</tt>
- * @throws HibernateException
- * @see org.hibernate.Query#iterate
- * @see Query#iterate()
- */
- public static void close(Iterator iterator) throws HibernateException {
- if ( iterator instanceof HibernateIterator ) {
- ( ( HibernateIterator ) iterator ).close();
- }
- else {
- throw new IllegalArgumentException( "not a Hibernate iterator" );
- }
- }
-
- /**
- * Check if the property is initialized. If the named property does not exist
- * or is not persistent, this method always returns <tt>true</tt>.
- *
- * @param proxy The potential proxy
- * @param propertyName the name of a persistent attribute of the object
- * @return true if the named property of the object is not listed as uninitialized
- * @return false if the object is an uninitialized proxy, or the named property is uninitialized
- */
- public static boolean isPropertyInitialized(Object proxy, String propertyName) {
-
- Object entity;
- if ( proxy instanceof HibernateProxy ) {
- LazyInitializer li = ( ( HibernateProxy ) proxy ).getHibernateLazyInitializer();
- if ( li.isUninitialized() ) {
- return false;
- }
- else {
- entity = li.getImplementation();
- }
- }
- else {
- entity = proxy;
- }
-
- if ( FieldInterceptionHelper.isInstrumented( entity ) ) {
- FieldInterceptor interceptor = FieldInterceptionHelper.extractFieldInterceptor( entity );
- return interceptor == null || interceptor.isInitialized( propertyName );
- }
- else {
- return true;
- }
-
- }
-
-}
/trunk/src/org/hibernate/Hibernate.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/InstantiationException.java
===================================================================
--- trunk/src/org/hibernate/InstantiationException.java (revision 38)
+++ trunk/src/org/hibernate/InstantiationException.java (nonexistent)
@@ -1,67 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat Middleware LLC.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- *
- */
-package org.hibernate;
-
-/**
- * Thrown if Hibernate can't instantiate an entity or component
- * class at runtime.
- *
- * @author Gavin King
- */
-
-public class InstantiationException extends HibernateException {
-
- private final Class clazz;
-
- public InstantiationException(String s, Class clazz, Throwable root) {
- super(s, root);
- this.clazz = clazz;
- }
-
- public InstantiationException(String s, Class clazz) {
- super(s);
- this.clazz = clazz;
- }
-
- public InstantiationException(String s, Class clazz, Exception e) {
- super(s, e);
- this.clazz = clazz;
- }
-
- public Class getPersistentClass() {
- return clazz;
- }
-
- public String getMessage() {
- return super.getMessage() + clazz.getName();
- }
-
-}
-
-
-
-
-
-
/trunk/src/org/hibernate/InstantiationException.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/ScrollMode.java
===================================================================
--- trunk/src/org/hibernate/ScrollMode.java (revision 38)
+++ trunk/src/org/hibernate/ScrollMode.java (nonexistent)
@@ -1,97 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat Middleware LLC.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- *
- */
-package org.hibernate;
-
-import java.io.Serializable;
-import java.sql.ResultSet;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Specifies the type of JDBC scrollable result set to use
- * underneath a <tt>ScrollableResults</tt>
- *
- * @see Query#scroll(ScrollMode)
- * @see ScrollableResults
- * @author Gavin King
- */
-public final class ScrollMode implements Serializable {
- private final int resultSetType;
- private final String name;
- private static final Map INSTANCES = new HashMap();
-
- private ScrollMode(int level, String name) {
- this.resultSetType=level;
- this.name=name;
- }
-
- public String toString() {
- return name;
- }
-
- /**
- * @return the JDBC result set type code
- */
- public int toResultSetType() {
- return resultSetType;
- }
-
- /**
- * @see java.sql.ResultSet.TYPE_FORWARD_ONLY
- */
- public static final ScrollMode FORWARD_ONLY = new ScrollMode(ResultSet.TYPE_FORWARD_ONLY, "FORWARD_ONLY");
- /**
- * @see java.sql.ResultSet.TYPE_SCROLL_SENSITIVE
- */
- public static final ScrollMode SCROLL_SENSITIVE = new ScrollMode(ResultSet.TYPE_SCROLL_SENSITIVE, "SCROLL_SENSITIVE");
- /**
- * Note that since the Hibernate session acts as a cache, you
- * might need to expicitly evict objects, if you need to see
- * changes made by other transactions.
- * @see java.sql.ResultSet.TYPE_SCROLL_INSENSITIVE
- */
- public static final ScrollMode SCROLL_INSENSITIVE = new ScrollMode(ResultSet.TYPE_SCROLL_INSENSITIVE, "SCROLL_INSENSITIVE");
-
- public boolean lessThan(ScrollMode other) {
- return this.resultSetType<other.resultSetType;
- }
-
- static {
- INSTANCES.put( FORWARD_ONLY.name, FORWARD_ONLY );
- INSTANCES.put( SCROLL_INSENSITIVE.name, SCROLL_INSENSITIVE );
- INSTANCES.put( SCROLL_SENSITIVE.name, SCROLL_SENSITIVE );
- }
-
- private Object readResolve() {
- return INSTANCES.get(name);
- }
-
-}
-
-
-
-
-
-
/trunk/src/org/hibernate/ScrollMode.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/MappingException.java
===================================================================
--- trunk/src/org/hibernate/MappingException.java (revision 38)
+++ trunk/src/org/hibernate/MappingException.java (nonexistent)
@@ -1,54 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat Middleware LLC.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- *
- */
-package org.hibernate;
-
-/**
- * An exception that usually occurs at configuration time, rather
- * than runtime, as a result of something screwy in the O-R mappings.
- *
- * @author Gavin King
- */
-
-public class MappingException extends HibernateException {
-
- public MappingException(String msg, Throwable root) {
- super( msg, root );
- }
-
- public MappingException(Throwable root) {
- super(root);
- }
-
- public MappingException(String s) {
- super(s);
- }
-
-}
-
-
-
-
-
-
/trunk/src/org/hibernate/MappingException.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/CallbackException.java
===================================================================
--- trunk/src/org/hibernate/CallbackException.java (revision 38)
+++ trunk/src/org/hibernate/CallbackException.java (nonexistent)
@@ -1,56 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat Middleware LLC.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- *
- */
-package org.hibernate;
-
-/**
- * Should be thrown by persistent objects from <tt>Lifecycle</tt>
- * or <tt>Interceptor</tt> callbacks.
- *
- * @see org.hibernate.classic.Lifecycle
- * @see Interceptor
- * @author Gavin King
- */
-
-public class CallbackException extends HibernateException {
-
- public CallbackException(Exception root) {
- super("An exception occurred in a callback", root);
- }
-
- public CallbackException(String message) {
- super(message);
- }
-
- public CallbackException(String message, Exception e) {
- super(message, e);
- }
-
-}
-
-
-
-
-
-
/trunk/src/org/hibernate/CallbackException.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/org/hibernate/SessionFactory.java
===================================================================
--- trunk/src/org/hibernate/SessionFactory.java (revision 38)
+++ trunk/src/org/hibernate/SessionFactory.java (nonexistent)
@@ -1,247 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat Middleware LLC.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- *
- */
-package org.hibernate;
-
-import java.io.Serializable;
-import java.sql.Connection;
-import java.util.Map;
-import java.util.Set;
-
-import javax.naming.Referenceable;
-
-import org.hibernate.metadata.ClassMetadata;
-import org.hibernate.metadata.CollectionMetadata;
-import org.hibernate.stat.Statistics;
-import org.hibernate.engine.FilterDefinition;
-
-/**
- * Creates <tt>Session</tt>s. Usually an application has a single <tt>SessionFactory</tt>.
- * Threads servicing client requests obtain <tt>Session</tt>s from the factory.<br>
- * <br>
- * Implementors must be threadsafe.<br>
- * <br>
- * <tt>SessionFactory</tt>s are immutable. The behaviour of a <tt>SessionFactory</tt> is
- * controlled by properties supplied at configuration time. These properties are defined
- * on <tt>Environment</tt>.
- *
- * @see Session
- * @see org.hibernate.cfg.Environment
- * @see org.hibernate.cfg.Configuration
- * @see org.hibernate.connection.ConnectionProvider
- * @see org.hibernate.transaction.TransactionFactory
- * @author Gavin King
- */
-public interface SessionFactory extends Referenceable, Serializable {
-
- /**
- * Open a <tt>Session</tt> on the given connection.
- * <p>
- * Note that the second-level cache will be disabled if you
- * supply a JDBC connection. Hibernate will not be able to track
- * any statements you might have executed in the same transaction.
- * Consider implementing your own <tt>ConnectionProvider</tt>.
- *
- * @param connection a connection provided by the application.
- * @return Session
- */
- public org.hibernate.classic.Session openSession(Connection connection);
-
- /**
- * Create database connection and open a <tt>Session</tt> on it, specifying an
- * interceptor.
- *
- * @param interceptor a session-scoped interceptor
- * @return Session
- * @throws HibernateException
- */
- public org.hibernate.classic.Session openSession(Interceptor interceptor) throws HibernateException;
-
- /**
- * Open a <tt>Session</tt> on the given connection, specifying an interceptor.
- * <p>
- * Note that the second-level cache will be disabled if you
- * supply a JDBC connection. Hibernate will not be able to track
- * any statements you might have executed in the same transaction.
- * Consider implementing your own <tt>ConnectionProvider</tt>.
- *
- * @param connection a connection provided by the application.
- * @param interceptor a session-scoped interceptor
- * @return Session
- */
- public org.hibernate.classic.Session openSession(Connection connection, Interceptor interceptor);
-
- /**
- * Create database connection and open a <tt>Session</tt> on it.
- *
- * @return Session
- * @throws HibernateException
- */
- public org.hibernate.classic.Session openSession() throws HibernateException;
-
- /**
- * Obtains the current session. The definition of what exactly "current"
- * means controlled by the {@link org.hibernate.context.CurrentSessionContext} impl configured
- * for use.
- * <p/>
- * Note that for backwards compatibility, if a {@link org.hibernate.context.CurrentSessionContext}
- * is not configured but a JTA {@link org.hibernate.transaction.TransactionManagerLookup}
- * is configured this will default to the {@link org.hibernate.context.JTASessionContext}
- * impl.
- *
- * @return The current session.
- * @throws HibernateException Indicates an issue locating a suitable current session.
- */
- public org.hibernate.classic.Session getCurrentSession() throws HibernateException;
-
- /**
- * Get the <tt>ClassMetadata</tt> associated with the given entity class
- *
- * @see org.hibernate.metadata.ClassMetadata
- */
- public ClassMetadata getClassMetadata(Class persistentClass) throws HibernateException;
-
- /**
- * Get the <tt>ClassMetadata</tt> associated with the given entity name
- *
- * @see org.hibernate.metadata.ClassMetadata
- * @since 3.0
- */
- public ClassMetadata getClassMetadata(String entityName) throws HibernateException;
-
- /**
- * Get the <tt>CollectionMetadata</tt> associated with the named collection role
- *
- * @see org.hibernate.metadata.CollectionMetadata
- */
- public CollectionMetadata getCollectionMetadata(String roleName) throws HibernateException;
-
-
- /**
- * Get all <tt>ClassMetadata</tt> as a <tt>Map</tt> from entityname <tt>String</tt>
- * to metadata object
- *
- * @see org.hibernate.metadata.ClassMetadata
- * @return a map from <tt>String</tt> an entity name to <tt>ClassMetaData</tt>
- * @since 3.0 changed key from <tt>Class</tt> to <tt>String</tt>
- */
- public Map getAllClassMetadata() throws HibernateException;
-
- /**
- * Get all <tt>CollectionMetadata</tt> as a <tt>Map</tt> from role name
- * to metadata object
- *
- * @see org.hibernate.metadata.CollectionMetadata
- * @return a map from <tt>String</tt> to <tt>CollectionMetadata</tt>
- */
- public Map getAllCollectionMetadata() throws HibernateException;
-
- /**
- * Get the statistics for this session factory
- */
- public Statistics getStatistics();
-
- /**
- * Destroy this <tt>SessionFactory</tt> and release all resources (caches,
- * connection pools, etc). It is the responsibility of the application
- * to ensure that there are no open <tt>Session</tt>s before calling
- * <tt>close()</tt>.
- */
- public void close() throws HibernateException;
-
- /**
- * Was this <tt>SessionFactory</tt> already closed?
- */
- public boolean isClosed();
-
- /**
- * Evict all entries from the second-level cache. This method occurs outside
- * of any transaction; it performs an immediate "hard" remove, so does not respect
- * any transaction isolation semantics of the usage strategy. Use with care.
- */
- public void evict(Class persistentClass) throws HibernateException;
- /**
- * Evict an entry from the second-level cache. This method occurs outside
- * of any transaction; it performs an immediate "hard" remove, so does not respect
- * any transaction isolation semantics of the usage strategy. Use with care.
- */
- public void evict(Class persistentClass, Serializable id) throws HibernateException;
- /**
- * Evict all entries from the second-level cache. This method occurs outside
- * of any transaction; it performs an immediate "hard" remove, so does not respect
- * any transaction isolation semantics of the usage strategy. Use with care.
- */
- public void evictEntity(String entityName) throws HibernateException;
- /**
- * Evict an entry from the second-level cache. This method occurs outside
- * of any transaction; it performs an immediate "hard" remove, so does not respect
- * any transaction isolation semantics of the usage strategy. Use with care.
- */
- public void evictEntity(String entityName, Serializable id) throws HibernateException;
- /**
- * Evict all entries from the second-level cache. This method occurs outside
- * of any transaction; it performs an immediate "hard" remove, so does not respect
- * any transaction isolation semantics of the usage strategy. Use with care.
- */
- public void evictCollection(String roleName) throws HibernateException;
- /**
- * Evict an entry from the second-level cache. This method occurs outside
- * of any transaction; it performs an immediate "hard" remove, so does not respect
- * any transaction isolation semantics of the usage strategy. Use with care.
- */
- public void evictCollection(String roleName, Serializable id) throws HibernateException;
-
- /**
- * Evict any query result sets cached in the default query cache region.
- */
- public void evictQueries() throws HibernateException;
- /**
- * Evict any query result sets cached in the named query cache region.
- */
- public void evictQueries(String cacheRegion) throws HibernateException;
- /**
- * Get a new stateless session.
- */
- public StatelessSession openStatelessSession();
- /**
- * Get a new stateless session for the given JDBC connection.
- */
- public StatelessSession openStatelessSession(Connection connection);
-
- /**
- * Obtain a set of the names of all filters defined on this SessionFactory.
- *
- * @return The set of filter names.
- */
- public Set getDefinedFilterNames();
-
- /**
- * Obtain the definition of a filter by name.
- *
- * @param filterName The name of the filter for which to obtain the definition.
- * @return The filter definition.
- * @throws HibernateException If no filter defined with the given name.
- */
- public FilterDefinition getFilterDefinition(String filterName) throws HibernateException;
-}
/trunk/src/org/hibernate/SessionFactory.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/TemporalType.java
===================================================================
--- trunk/src/javax/persistence/TemporalType.java (revision 38)
+++ trunk/src/javax/persistence/TemporalType.java (nonexistent)
@@ -1,21 +0,0 @@
-//$Id: TemporalType.java 14298 2008-01-30 17:51:29Z epbernard $
-//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
-package javax.persistence;
-
-/**
- * Type used to indicate a specific mapping of {@link java.util.Date} or {@link java.util.Calendar).
- */
-public enum TemporalType {
- /**
- * Map as java.sql.Date
- */
- DATE,
- /**
- * Map as java.sql.Time
- */
- TIME,
- /**
- * Map as java.sql.Timestamp
- */
- TIMESTAMP
-}
\ No newline at end of file
/trunk/src/javax/persistence/TemporalType.java
Property changes:
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/DiscriminatorColumn.java
===================================================================
--- trunk/src/javax/persistence/DiscriminatorColumn.java (revision 38)
+++ trunk/src/javax/persistence/DiscriminatorColumn.java (nonexistent)
@@ -1,47 +0,0 @@
-//$Id: DiscriminatorColumn.java 11282 2007-03-14 22:05:59Z epbernard $
-//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
-package javax.persistence;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.ElementType.*;
-import static java.lang.annotation.RetentionPolicy.*;
-import static javax.persistence.DiscriminatorType.STRING;
-
-/**
- * Is used to define the discriminator column for the SINGLE_TABLE and JOINED inheritance
- * mapping strategies.
- *
- * The strategy and the discriminator column are only specified in the root of an entity
- * class hierarchy or subhierarchy in which a different inheritance strategy is applied
- *
- * If the DiscriminatorColumn annotation is missing, and a discriminator column is required,
- * the name of the discriminator column defaults to "DTYPE" and the discriminator type to
- * DiscriminatorType.STRING.
- *
- * @author Emmanuel Bernard
- */
-@Target({TYPE}) @Retention(RUNTIME)
-public @interface DiscriminatorColumn {
- /**
- * The name of column to be used for the discriminator.
- */
- String name() default "DTYPE";
- /**
- * The type of object/column to use as a class discriminator.
- * Defaults to DiscriminatorType.STRING
- */
- DiscriminatorType discriminatorType() default STRING;
- /**
- * The SQL fragment that is used when generating the DDL for the discriminator column.
- * Defaults to the provider-generated SQL to create a column of the specified
- * discriminator type.
- */
- String columnDefinition() default "";
- /**
- * The column length for String-based discriminator types. Ignored for other
- * discriminator types.
- */
- int length() default 31;
-}
/trunk/src/javax/persistence/DiscriminatorColumn.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/Table.java
===================================================================
--- trunk/src/javax/persistence/Table.java (revision 38)
+++ trunk/src/javax/persistence/Table.java (nonexistent)
@@ -1,48 +0,0 @@
-//$Id: Table.java 11282 2007-03-14 22:05:59Z epbernard $
-//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
-package javax.persistence;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.ElementType.*;
-import static java.lang.annotation.RetentionPolicy.*;
-
-/**
- * This annotation specifies the primary table for the annotated entity. Additional
- * tables may be specified using SecondaryTable or SecondaryTables annotation.
- *
- * If no Table annotation is specified for an entity class, the default values apply.
- *
- * @author Emmanuel Bernard
- */
-@Target({TYPE}) @Retention(RUNTIME)
-public @interface Table {
- /**
- * The name of the table.
- *
- * Defaults to the entity name.
- */
- String name() default "";
- /**
- * The catalog of the table.
- *
- * Defaults to the default catalog.
- */
- String catalog() default "";
- /**
- * The schema of the table.
- *
- * Defaults to the default schema for user.
- */
- String schema() default "";
- /**
- * Unique constraints that are to be placed on the table. These are only used if table
- * generation is in effect. These constraints apply in addition to any constraints
- * specified by the Column and JoinColumn annotations and constraints entailed by
- * primary key mappings.
- *
- * Defaults to no additional constraints.
- */
- UniqueConstraint[] uniqueConstraints() default {};
-}
/trunk/src/javax/persistence/Table.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/FlushModeType.java
===================================================================
--- trunk/src/javax/persistence/FlushModeType.java (revision 38)
+++ trunk/src/javax/persistence/FlushModeType.java (nonexistent)
@@ -1,29 +0,0 @@
-//$Id: FlushModeType.java 11282 2007-03-14 22:05:59Z epbernard $
-package javax.persistence;
-
-/**
- * Flush mode setting.
- *
- * When queries are executed within a transaction, if FlushModeType.AUTO is set on the Query object,
- * or if the flush mode setting for the persistence context is AUTO (the default) and a flush mode
- * setting has not been specified for the Query object, the persistence provider is responsible for
- * ensuring that all updates to the state of all entities in the persistence context which could
- * potentially affect the result of the query are visible to the processing of the query.
- * The persistence provider implementation may achieve this by flushing those entities to the database
- * or by some other means. If FlushModeType.COMMIT is set, the effect of updates made to entities in the
- * persistence context upon queries is unspecified.
- *
- * If there is no transaction active, the persistence provider must not flush to the database.
- *
- * @author Gavin King
- */
-public enum FlushModeType {
- /**
- * Flushing must occur only at transaction commit
- */
- COMMIT,
- /**
- * (Default) Flushing to occur at query execution
- */
- AUTO
-}
/trunk/src/javax/persistence/FlushModeType.java
Property changes:
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/PersistenceContext.java
===================================================================
--- trunk/src/javax/persistence/PersistenceContext.java (revision 38)
+++ trunk/src/javax/persistence/PersistenceContext.java (nonexistent)
@@ -1,43 +0,0 @@
-/* $Id: PersistenceContext.java 11282 2007-03-14 22:05:59Z epbernard $
- * JBoss Inc
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-package javax.persistence;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Expresses a dependency on an EntityManager persistence context.
- *
- * @author <a href="mailto:bill@jboss.org">Bill Burke</a>
- */
-@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface PersistenceContext {
- /**
- * The name by which the entity manager is to be accessed in the environment referencing context,
- * and is not needed when dependency injection is used.
- */
- String name() default "";
- /**
- * The name of the persistence unit. If the unitName element is specified, the persistence unit
- * for the entity manager that is accessible in JNDI must have the same name.
- */
- String unitName() default "";
- /**
- * Used to specify properties for the container or persistence provider. Vendor specific
- * properties may be included in this set of properties. Properties that are not
- * recognized by a vendor are ignored.
- */
- PersistenceProperty[] properties() default {};
- /**
- * Specifies whether this is a transaction-scoped persistence context or
- * an extended persistence context.
- */
- PersistenceContextType type() default PersistenceContextType.TRANSACTION;
-}
/trunk/src/javax/persistence/PersistenceContext.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/PrimaryKeyJoinColumn.java
===================================================================
--- trunk/src/javax/persistence/PrimaryKeyJoinColumn.java (revision 38)
+++ trunk/src/javax/persistence/PrimaryKeyJoinColumn.java (nonexistent)
@@ -1,53 +0,0 @@
-//$Id: PrimaryKeyJoinColumn.java 11282 2007-03-14 22:05:59Z epbernard $
-//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
-package javax.persistence;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.ElementType.*;
-import static java.lang.annotation.RetentionPolicy.*;
-
-/**
- * This annotation specifies a primary key column that is used as a foreign key to join to another
- * table.
- *
- * It is used to join the primary table of an entity subclass in the JOINED mapping strategy to
- * the primary table of its superclass; it is used within a SecondaryTable annotation to join a
- * secondary table to a primary table; and it may be used in a OneToOne mapping in which the
- * primary key of the referencing entity is used as a foreign key to the referenced entity.
- *
- * If no PrimaryKeyJoinColumn annotation is specified for a subclass in the JOINED mapping
- * strategy, the foreign key columns are assumed to have the same names as the primary key
- * columns of the primary table of the superclass
- *
- * @author Emmanuel Bernard
- */
-@Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME)
-public @interface PrimaryKeyJoinColumn {
- /**
- * The name of the primary key column of the current table.
- *
- * Defaults to the same name as the primary key column of the primary table of the
- * superclass (JOINED mapping strategy); the same name as the primary key column of
- * the primary table (SecondaryTable mapping); or the same name as the primary key
- * column for the table for the referencing entity (OneToOne mapping)
- */
- String name() default "";
- /**
- * The name of the primary key column of the table being joined to.
- *
- * Defaults to the same name as the primary key column of the primary table of the
- * superclass (JOINED mapping strategy); the same name as the primary key column of the
- * primary table (SecondaryTable mapping); or the same name as the primary key column for
- * the table for the referencing entity (OneToOne mapping)
- */
- String referencedColumnName() default "";
- /**
- * The SQL fragment that is used when generating the DDL for the column. This should not be
- * specified for a OneToOne primary key association.
- *
- * Defaults to the generated SQL to create a column of the inferred type.
- */
- String columnDefinition() default "";
-}
/trunk/src/javax/persistence/PrimaryKeyJoinColumn.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/ManyToMany.java
===================================================================
--- trunk/src/javax/persistence/ManyToMany.java (revision 38)
+++ trunk/src/javax/persistence/ManyToMany.java (nonexistent)
@@ -1,51 +0,0 @@
-//$Id: ManyToMany.java 11282 2007-03-14 22:05:59Z epbernard $
-//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
-package javax.persistence;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.ElementType.*;
-import static java.lang.annotation.RetentionPolicy.*;
-import static javax.persistence.FetchType.*;
-
-/**
- * Defines a many-valued association with many-to-many multiplicity. If the Collection is
- * defined using generics to specify the element type, the associated target entity class
- * does not need to be specified; otherwise it must be specified.
- *
- * Every many-to-many association has two sides, the owning side and the non-owning, or inverse,
- * side. The join table is specified on the owning side. If the association is bidirectional,
- * either side may be designated as the owning side.
- *
- * The same annotation elements for the OneToMany annotation apply to the ManyToMany annotation.
- *
- * @author Emmanuel Bernard
- */
-@Target({METHOD, FIELD}) @Retention(RUNTIME)
-public @interface ManyToMany {
- /**
- * The entity class that is the target of the association. Optional only if the
- * collection property is defined using Java generics. Must be specified otherwise.
- *
- * Defaults to the parameterized type of the collection when defined using generics.
- */
- Class targetEntity() default void.class;
- /**
- * The operations that must be cascaded to the target of the association.
- *
- * Defaults to no operations being cascaded.
- */
- CascadeType[] cascade() default {};
- /**
- * Whether the association should be lazily loaded or must be eagerly fetched.
- * The EAGER strategy is a requirement on the persistenceprovider runtime that
- * the associatedentities must be eagerly fetched. The LAZY strategy is a hint
- * to the persistence provider runtime.
- */
- FetchType fetch() default LAZY;
- /**
- * The field that owns the relationship. Required unless the relationship is unidirectional.
- */
- String mappedBy() default "";
-}
\ No newline at end of file
/trunk/src/javax/persistence/ManyToMany.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/TableGenerator.java
===================================================================
--- trunk/src/javax/persistence/TableGenerator.java (revision 38)
+++ trunk/src/javax/persistence/TableGenerator.java (nonexistent)
@@ -1,67 +0,0 @@
-//$Id: TableGenerator.java 11282 2007-03-14 22:05:59Z epbernard $
-//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
-package javax.persistence;
-
-import static java.lang.annotation.ElementType.*;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-/**
- * This annotation defines a primary key generator that may be referenced by name when a generator
- * element is specified for the GeneratedValue annotation. A table generator may be specified on the
- * entity class or on the primary key field or property. The scope of the generator name is global to
- * the persistence unit (across all generator types).
- *
- * @author Emmanuel Bernard
- */
-@Target({TYPE, METHOD, FIELD})
-@Retention(RUNTIME)
-public @interface TableGenerator {
- /**
- * A unique generator name that can be referenced by one or more classes to be the generator for id values
- */
- String name();
- /**
- * Name of table that stores the generated id values. Defaults to a name chosen by persistence provider.
- */
- String table() default "";
- /**
- * The catalog of the table
- * Defaults to the default catalog
- */
- String catalog() default "";
- /**
- * The schema of the table
- * Defaults to the default schema for user
- */
- String schema() default "";
- /**
- * Name of the primary key column in the table
- * Defaults to a provider-chosen name
- */
- String pkColumnName() default "";
- /**
- * Name of the column that stores the last value generated
- * Defaults to a provider-chosen name
- */
- String valueColumnName() default "";
- /**
- * The primary key value in the generator table that distinguishes this set of generated values from others that may be stored in the table
- * Defaults to a provider-chosen value to store in the primary key column of the generator table
- */
- String pkColumnValue() default "";
- /**
- * The initial value to be used when allocating id numbers from the generator
- */
- int initialValue() default 0;
- /**
- * The amount to increment by when allocating id numbers from the generator
- */
- int allocationSize() default 50;
- /**
- * Unique constraints that are to be placed on the table. These are only used if table generation is in effect. These constraints apply in addition to primary key constraints
- * Defaults to no additional constraints
- */
- UniqueConstraint[] uniqueConstraints() default {};
-}
/trunk/src/javax/persistence/TableGenerator.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/NonUniqueResultException.java
===================================================================
--- trunk/src/javax/persistence/NonUniqueResultException.java (revision 38)
+++ trunk/src/javax/persistence/NonUniqueResultException.java (nonexistent)
@@ -1,29 +0,0 @@
-//$Id: NonUniqueResultException.java 11282 2007-03-14 22:05:59Z epbernard $
-package javax.persistence;
-
-/**
- * Thrown by the persistence provider when getSingleResult() is executed on a query and there is more than
- * one result from the query. This exception will not cause the current transaction, if one is active, to be
- * marked for roll back.
- *
- * @author Gavin King
- */
-public class NonUniqueResultException extends PersistenceException {
-
- /**
- * Constructs a new NonUniqueResultException exception with null as its detail message
- */
- public NonUniqueResultException() {
- super();
- }
-
- /**
- * Constructs a new NonUniqueResultException exception with the specified detail message
- *
- * @param message
- */
- public NonUniqueResultException(String message) {
- super( message );
- }
-
-}
/trunk/src/javax/persistence/NonUniqueResultException.java
Property changes:
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/EntityManagerFactory.java
===================================================================
--- trunk/src/javax/persistence/EntityManagerFactory.java (revision 38)
+++ trunk/src/javax/persistence/EntityManagerFactory.java (nonexistent)
@@ -1,49 +0,0 @@
-//$Id: EntityManagerFactory.java 11282 2007-03-14 22:05:59Z epbernard $
-package javax.persistence;
-
-import java.util.Map;
-
-/**
- * The EntityManagerFactory interface is used by the application to obtain an
- * application-managed entity manager. When the application has finished using
- * the entity manager factory, and/or at application shutdown, the application
- * should close the entity manager factory. Once an EntityManagerFactory has been
- * closed, all its entity managers are considered to be in the closed state.
- *
- * @author Emmanuel Bernard
- */
-public interface EntityManagerFactory {
-
- /**
- * Create a new EntityManager.
- * This method returns a new EntityManager instance each time
- * it is invoked.
- * The isOpen method will return true on the returned instance.
- */
- EntityManager createEntityManager();
-
- /**
- * Create a new EntityManager with the specified Map of
- * properties.
- * This method returns a new EntityManager instance each time
- * it is invoked.
- * The isOpen method will return true on the returned instance.
- */
- EntityManager createEntityManager(Map map);
-
- /**
- * Close the factory, releasing any resources that it holds.
- * After a factory instance is closed, all methods invoked on
- * it will throw an IllegalStateException, except for isOpen,
- * which will return false. Once an EntityManagerFactory has
- * been closed, all its entity managers are considered to be
- * in the closed state.
- */
- void close();
-
- /**
- * Indicates whether or not this factory is open. Returns
- * true until a call to close has been made.
- */
- public boolean isOpen();
-}
\ No newline at end of file
/trunk/src/javax/persistence/EntityManagerFactory.java
Property changes:
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/PostPersist.java
===================================================================
--- trunk/src/javax/persistence/PostPersist.java (revision 38)
+++ trunk/src/javax/persistence/PostPersist.java (nonexistent)
@@ -1,25 +0,0 @@
-/* $Id: PostPersist.java 11282 2007-03-14 22:05:59Z epbernard $
- * JBoss Inc
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-package javax.persistence;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-
-/**
- * Is used to specify callback methods for the corresponding lifecycle event. This annotation may be
- * applied to methods of an entity class, a mapped superclass, or a callback listener class.
- *
- * @author <a href="mailto:bill@jboss.org">Bill Burke</a>
- */
-@Target({ElementType.METHOD})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface PostPersist {
-}
/trunk/src/javax/persistence/PostPersist.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/PreRemove.java
===================================================================
--- trunk/src/javax/persistence/PreRemove.java (revision 38)
+++ trunk/src/javax/persistence/PreRemove.java (nonexistent)
@@ -1,25 +0,0 @@
-/* $Id: PreRemove.java 11282 2007-03-14 22:05:59Z epbernard $
- * JBoss Inc
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-package javax.persistence;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-
-/**
- * Is used to specify callback methods for the corresponding lifecycle event. This annotation may be applied
- * to methods of an entity class, a mapped superclass, or a callback listener class.
- *
- * @author <a href="mailto:bill@jboss.org">Bill Burke</a>
- */
-@Target({ElementType.METHOD})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface PreRemove {
-}
/trunk/src/javax/persistence/PreRemove.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/EntityListeners.java
===================================================================
--- trunk/src/javax/persistence/EntityListeners.java (revision 38)
+++ trunk/src/javax/persistence/EntityListeners.java (nonexistent)
@@ -1,28 +0,0 @@
-/*
- * JBoss, the OpenSource J2EE webOS
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-package javax.persistence;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-
-/**
- * Specifies the callback listener classes to be used for an entity or mapped superclass.
- * This annotation may be applied to an entity class or mapped superclass.
- *
- * @author <a href="mailto:bill@jboss.org">Bill Burke</a>
- */
-@Target({ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface EntityListeners {
- /**
- * The callback listener classes
- */
- Class[] value();
-}
/trunk/src/javax/persistence/EntityListeners.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/Transient.java
===================================================================
--- trunk/src/javax/persistence/Transient.java (revision 38)
+++ trunk/src/javax/persistence/Transient.java (nonexistent)
@@ -1,18 +0,0 @@
-//$Id: Transient.java 11282 2007-03-14 22:05:59Z epbernard $
-//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
-package javax.persistence;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.ElementType.*;
-import static java.lang.annotation.RetentionPolicy.*;
-
-/**
- * This annotation specifies that the property or field is not persistent. It is used to annotate
- * a property or field of an entity class, mapped superclass, or embeddable class.
- *
- * @author Emmanuel Bernard
- */
-@Target({METHOD, FIELD}) @Retention(RUNTIME)
-public @interface Transient {}
/trunk/src/javax/persistence/Transient.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/ManyToOne.java
===================================================================
--- trunk/src/javax/persistence/ManyToOne.java (revision 38)
+++ trunk/src/javax/persistence/ManyToOne.java (nonexistent)
@@ -1,44 +0,0 @@
-//$Id: ManyToOne.java 11282 2007-03-14 22:05:59Z epbernard $
-//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
-package javax.persistence;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.ElementType.*;
-import static java.lang.annotation.RetentionPolicy.*;
-import static javax.persistence.FetchType.*;
-
-/**
- * This annotation defines a single-valued association to another entity class that has
- * many-to-one multiplicity. It is not normally necessary to specify the target entity
- * explicitly since it can usually be inferred from the type of the object being referenced.
- *
- * @author Emmanuel Bernard
- */
-@Target({METHOD, FIELD}) @Retention(RUNTIME)
-public @interface ManyToOne {
- /**
- * The entity class that is the target of the association.
- *
- * Defaults to the type of the field or property that stores the association
- */
- Class targetEntity() default void.class;
- /**
- * The operations that must be cascaded to the target of the association.
- *
- * By default no operations are cascaded.
- */
- CascadeType[] cascade() default {};
- /**
- * Whether the association should be lazily loaded or must be eagerly fetched.
- * The EAGER strategy is a requirement on the persistence provider runtime that
- * the associated entity must be eagerly fetched. The LAZY strategy is a hint to
- * the persistence provider runtime.
- */
- FetchType fetch() default EAGER;
- /**
- * Whether the association is optional. If set to false then a non-null relationship must always exist.
- */
- boolean optional() default true;
-}
/trunk/src/javax/persistence/ManyToOne.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/NamedQuery.java
===================================================================
--- trunk/src/javax/persistence/NamedQuery.java (revision 38)
+++ trunk/src/javax/persistence/NamedQuery.java (nonexistent)
@@ -1,31 +0,0 @@
-//$Id: NamedQuery.java 11282 2007-03-14 22:05:59Z epbernard $
-//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
-package javax.persistence;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-import static java.lang.annotation.RetentionPolicy.*;
-import static java.lang.annotation.ElementType.*;
-
-/**
- * Is used to specify a named query in the Java Persistence query language, which is a static
- * query expressed in metadata. Query names are scoped to the persistence unit.
- *
- * @author Emmanuel Bernard
- */
-//TODO remove the mackage target
-@Target({TYPE}) @Retention(RUNTIME)
-public @interface NamedQuery {
- /**
- * Refers to the query when using the EntityManager methods that create query objects.
- */
- String name();
- /**
- * The query string in the Java Persistence query language
- */
- String query();
- /**
- * Vendor-specific query hints
- */
- QueryHint[] hints() default {};
-}
/trunk/src/javax/persistence/NamedQuery.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/AssociationOverride.java
===================================================================
--- trunk/src/javax/persistence/AssociationOverride.java (revision 38)
+++ trunk/src/javax/persistence/AssociationOverride.java (nonexistent)
@@ -1,34 +0,0 @@
-//$Id:$
-//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
-package javax.persistence;
-
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.FIELD;
-
-/**
- * This annotation is used to override a many-to-one or one-to-one mapping of property or field for
- * an entity relationship.
- * The AssociationOverride annotation may be applied to an entity that extends a mapped superclass
- * to override a many-to-one or one-to-one mapping defined by the mapped superclass. If the
- * AssociationOverride annotation is not specified, the join column is mapped the same as in
- * the original mapping.
- *
- * @author Emmanuel Bernard
- */
-@Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME)
-public @interface AssociationOverride {
- /**
- * The name of the relationship property whose mapping is being overridden if property-based
- * access is being used, or the name of the relationship field if field-based access is used.
- */
- String name();
-
- /**
- * The join column that is being mapped to the persistent attribute.
- */
- JoinColumn[] joinColumns();
-}
/trunk/src/javax/persistence/AssociationOverride.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/OptimisticLockException.java
===================================================================
--- trunk/src/javax/persistence/OptimisticLockException.java (revision 38)
+++ trunk/src/javax/persistence/OptimisticLockException.java (nonexistent)
@@ -1,42 +0,0 @@
-//$Id: $
-package javax.persistence;
-
-/**
- * Thrown by the persistence provider when an optimistic locking conflict occurs.
- * This exception may be thrown as part of an API call, a flush or at commit time.
- * The current transaction, if one is active, will be marked for rollback.
- *
- * @author Emmanuel Bernard
- */
-public class OptimisticLockException extends PersistenceException {
- private Object entity;
-
- public OptimisticLockException() {
- super();
- }
-
- public OptimisticLockException(Object entity) {
- this.entity = entity;
- }
-
- public OptimisticLockException(Throwable cause) {
- super( cause );
- }
-
- public OptimisticLockException(String message) {
- super( message );
- }
-
- public OptimisticLockException(String message, Throwable cause) {
- super( message, cause );
- }
-
- public OptimisticLockException(String message, Throwable cause, Object entity) {
- super( message, cause );
- this.entity = entity;
- }
-
- public Object getEntity() {
- return entity;
- }
-}
/trunk/src/javax/persistence/OptimisticLockException.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/JoinColumn.java
===================================================================
--- trunk/src/javax/persistence/JoinColumn.java (revision 38)
+++ trunk/src/javax/persistence/JoinColumn.java (nonexistent)
@@ -1,67 +0,0 @@
-//$Id: JoinColumn.java 11282 2007-03-14 22:05:59Z epbernard $
-//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
-package javax.persistence;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.ElementType.*;
-import static java.lang.annotation.RetentionPolicy.*;
-
-/**
- * Is used to specify a mapped column for joining an entity association.
- *
- * @author Emmanuel Bernard
- */
-@Target({METHOD, FIELD}) @Retention(RUNTIME)
-public @interface JoinColumn {
- /**
- * The name of the foreign key column.
- * The table in which it is found depends upon the context. If the join is for a OneToOne
- * or Many- ToOne mapping, the foreign key column is in the table of the source entity.
- * If the join is for a ManyToMany, the foreign key is in a join table. Default (only applies
- * if a single join column is used): The concatenation of the following: the name of the referencing
- * relationship property or field of the referencing entity; "_"; the name of the referenced primary
- * key column. If there is no such referencing relationship property or field in the entity, the join
- * column name is formed as the concatenation of the following: the name of the entity; "_"; the name
- * of the referenced primary key column.
- */
- String name() default "";
- /**
- * The name of the column referenced by this foreign key column. When used with relationship mappings,
- * the referenced column is in the table of the target entity. When used inside a JoinTable annotation,
- * the referenced key column is in the entity table of the owning entity, or inverse entity if the join
- * is part of the inverse join definition. Default (only applies if single join column is being used):
- * The same name as the primary key column of the referenced table.
- */
- String referencedColumnName() default "";
- /**
- * Whether the property is a unique key. This is a shortcut for the UniqueConstraint annotation at the
- * table level and is useful for when the unique key constraint is only a single field. It is not
- * necessary to explicitly specify this for a join column that corresponds to a primary key that is part
- * of a foreign key.
- */
- boolean unique() default false;
- /**
- * Whether the foreign key column is nullable
- */
- boolean nullable() default true;
- /**
- * Whether the column is included in SQL INSERT statements generated by the persistence provider
- */
- boolean insertable() default true;
- /**
- * Whether the column is included in SQL UPDATE statements generated by the persistence provider
- */
- boolean updatable() default true;
- /**
- * The SQL fragment that is used when generating the DDL for the column.
- * Defaults to the generated SQL for the column.
- */
- String columnDefinition() default "";
- /**
- * The name of the table that contains the column. If a table is not specified, the column is
- * assumed to be in the primary table of the applicable entity
- */
- String table() default "";
-}
/trunk/src/javax/persistence/JoinColumn.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/Basic.java
===================================================================
--- trunk/src/javax/persistence/Basic.java (revision 38)
+++ trunk/src/javax/persistence/Basic.java (nonexistent)
@@ -1,39 +0,0 @@
-//$Id: Basic.java 11282 2007-03-14 22:05:59Z epbernard $
-//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
-package javax.persistence;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-import static javax.persistence.FetchType.EAGER;
-
-/**
- * The Basic annotation is the simplest type of mapping to a database column. The Basic
- * annotation can be applied to a persistent property or instance variable of any of the
- * following types: Java primitive types, wrappers of the primitive types, String,
- * java.math.BigInteger, java.math.BigDecimal, java.util.Date, java.util.Calendar,
- * java.sql.Date, java.sql.Time, java.sql.Timestamp, byte[], Byte[], char[], Character[],
- * enums, and any other type that implements Serializable.
- *
- * The use of the Basic annotation is optional for persistent fields and properties of these types.
-
- * @author Emmanuel Bernard
- */
-@Target({METHOD, FIELD}) @Retention(RUNTIME)
-public @interface Basic {
- /**
- * Defines whether the value of the field or property should be lazily loaded or must be
- * eagerly fetched. The EAGER strategy is a requirement on the persistence provider runtime
- * that the value must be eagerly fetched. The LAZY strategy is a hint to the persistence
- * provider runtime. If not specified, defaults to EAGER.
- */
- FetchType fetch() default EAGER;
- /**
- * Defines whether the value of the field or property may be null. This is a hint and is
- * disregarded for primitive types; it may be used in schema generation. If not specified,
- * defaults to true.
- */
- boolean optional() default true;
-}
/trunk/src/javax/persistence/Basic.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/IdClass.java
===================================================================
--- trunk/src/javax/persistence/IdClass.java (revision 38)
+++ trunk/src/javax/persistence/IdClass.java (nonexistent)
@@ -1,26 +0,0 @@
-//$Id: IdClass.java 11282 2007-03-14 22:05:59Z epbernard $
-//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
-package javax.persistence;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-/**
- * Specifies a composite primary key class that is mapped to multiple fields or properties
- * of the entity.
- *
- * The names of the fields or properties in the primary key class and the primary key fields
- * or properties of the entity must correspond and their types must be the same.
- *
- * @author Emmanuel Bernard
- */
-@Target({TYPE}) @Retention(RUNTIME)
-public @interface IdClass {
- /**
- * Primary key class
- */
- Class value();
-}
/trunk/src/javax/persistence/IdClass.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/PersistenceUnit.java
===================================================================
--- trunk/src/javax/persistence/PersistenceUnit.java (revision 38)
+++ trunk/src/javax/persistence/PersistenceUnit.java (nonexistent)
@@ -1,33 +0,0 @@
-/* $Id: PersistenceUnit.java 11282 2007-03-14 22:05:59Z epbernard $
- * JBoss Inc
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-package javax.persistence;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Expresses a dependency on an EntityManagerFactory.
- *
- * @author <a href="mailto:bill@jboss.org">Bill Burke</a>
- */
-@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface PersistenceUnit {
- /**
- * The name by which the entity manager factory is to be accessed in the environment
- * referencing context, and is not needed when dependency injection is used.
- */
- String name() default "";
- /**
- * The name of the persistence unit as defined in the persistence.xml file. If specified, the
- * persistence unit for the entity manager factory that is accessible in JNDI must have the
- * same name.
- */
- String unitName() default "";
-}
/trunk/src/javax/persistence/PersistenceUnit.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/MapKey.java
===================================================================
--- trunk/src/javax/persistence/MapKey.java (revision 38)
+++ trunk/src/javax/persistence/MapKey.java (nonexistent)
@@ -1,25 +0,0 @@
-package javax.persistence;
-
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
-
-/**
- * Is used to specify the map key for associations of type Map.
- * If a persistent field or property other than the primary key is used as a map key then it
- * is expected to have a uniqueness constraint associated with it.
- *
- * @author Emmanuel Bernard
- */
-@Target({METHOD, FIELD}) @Retention(RUNTIME)
-public @interface MapKey {
- /**
- * The name of the persistent field or property of the associated entity that is used as the map key.
- * If the name element is not specified, the primary key of the associated entity is used as the map key.
- * If the primary key is a composite primary key and is mapped as IdClass, an instance of the primary key
- * class is used as the key.
- */
- String name() default "";
-}
/trunk/src/javax/persistence/MapKey.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/PostUpdate.java
===================================================================
--- trunk/src/javax/persistence/PostUpdate.java (revision 38)
+++ trunk/src/javax/persistence/PostUpdate.java (nonexistent)
@@ -1,25 +0,0 @@
-/* $Id: PostUpdate.java 11282 2007-03-14 22:05:59Z epbernard $
- * JBoss Inc
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-package javax.persistence;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-
-/**
- * Is used to specify callback methods for the corresponding lifecycle event. This annotation may be applied to
- * methods of an entity class, a mapped superclass, or a callback listener class.
- *
- * @author <a href="mailto:bill@jboss.org">Bill Burke</a>
- */
-@Target({ElementType.METHOD})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface PostUpdate {
-}
/trunk/src/javax/persistence/PostUpdate.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/Enumerated.java
===================================================================
--- trunk/src/javax/persistence/Enumerated.java (revision 38)
+++ trunk/src/javax/persistence/Enumerated.java (nonexistent)
@@ -1,24 +0,0 @@
-//$Id: Enumerated.java 11282 2007-03-14 22:05:59Z epbernard $
-package javax.persistence;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.RetentionPolicy.*;
-import static java.lang.annotation.ElementType.*;
-import static javax.persistence.EnumType.*;
-
-/**
- * Specifies that a persistent property or field should be persisted as a enumerated type.
- * It may be used in conjunction with the Basic annotation.
- *
- * @author Emmanuel Bernard
- */
-@Target({METHOD, FIELD})
-@Retention(RUNTIME)
-public @interface Enumerated {
- /**
- * The type used in mapping an enum type
- */
- EnumType value() default ORDINAL;
-}
/trunk/src/javax/persistence/Enumerated.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/Inheritance.java
===================================================================
--- trunk/src/javax/persistence/Inheritance.java (revision 38)
+++ trunk/src/javax/persistence/Inheritance.java (nonexistent)
@@ -1,23 +0,0 @@
-//$Id: Inheritance.java 11282 2007-03-14 22:05:59Z epbernard $
-//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
-package javax.persistence;
-
-import static java.lang.annotation.ElementType.TYPE;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-import static javax.persistence.InheritanceType.SINGLE_TABLE;
-
-/**
- * Defines the inheritance strategy to be used for an entity class hierarchy. It is specified
- * on the entity class that is the root of the entity class hierarchy.
- *
- * @author Emmanuel Bernard
- */
-@Target({TYPE}) @Retention(RUNTIME)
-public @interface Inheritance {
- /**
- * The strategy to be used
- */
- InheritanceType strategy() default SINGLE_TABLE;
-}
/trunk/src/javax/persistence/Inheritance.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/NamedNativeQueries.java
===================================================================
--- trunk/src/javax/persistence/NamedNativeQueries.java (revision 38)
+++ trunk/src/javax/persistence/NamedNativeQueries.java (nonexistent)
@@ -1,21 +0,0 @@
-//$Id: NamedNativeQueries.java 11282 2007-03-14 22:05:59Z epbernard $
-//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
-package javax.persistence;
-
-import static java.lang.annotation.ElementType.TYPE;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-/**
- * Is used to specify an array of native SQL named queries. Query names are scoped to the persistence unit
- *
- * @author Emmanuel Bernard
- */
-@Target({TYPE}) @Retention(RUNTIME)
-public @interface NamedNativeQueries {
- /**
- * Array of native SQL named queries
- */
- NamedNativeQuery [] value ();
-}
/trunk/src/javax/persistence/NamedNativeQueries.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/NoResultException.java
===================================================================
--- trunk/src/javax/persistence/NoResultException.java (revision 38)
+++ trunk/src/javax/persistence/NoResultException.java (nonexistent)
@@ -1,27 +0,0 @@
-//$Id: NoResultException.java 11282 2007-03-14 22:05:59Z epbernard $
-package javax.persistence;
-
-/**
- * Thrown by the persistence provider when getSingleResult() is executed on a query and there is no result to return.
- * This exception will not cause the current transaction, if one is active, to be marked for roll back.
- *
- * @author Emmanuel Bernard
- */
-public class NoResultException extends PersistenceException {
-
- /**
- * Constructs a new NoResultException exception with null as its detail message
- */
- public NoResultException() {
- super();
- }
-
- /**
- * Constructs a new NoResultException exception with the specified detail message.
- *
- * @param message
- */
- public NoResultException(String message) {
- super( message );
- }
-}
/trunk/src/javax/persistence/NoResultException.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/PersistenceContextType.java
===================================================================
--- trunk/src/javax/persistence/PersistenceContextType.java (revision 38)
+++ trunk/src/javax/persistence/PersistenceContextType.java (nonexistent)
@@ -1,18 +0,0 @@
-//$Id: PersistenceContextType.java 11282 2007-03-14 22:05:59Z epbernard $
-package javax.persistence;
-
-/**
- * Specifies whether a transaction-scoped or extended persistence context is to be used in
- * PersistenceContext. If the type element is not specified, a transaction-scoped persistence
- * context is used.
- */
-public enum PersistenceContextType {
- /**
- * Transaction-scoped persistence context
- */
- TRANSACTION,
- /**
- * Extended persistence context
- */
- EXTENDED
-}
/trunk/src/javax/persistence/PersistenceContextType.java
Property changes:
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/LockModeType.java
===================================================================
--- trunk/src/javax/persistence/LockModeType.java (revision 38)
+++ trunk/src/javax/persistence/LockModeType.java (nonexistent)
@@ -1,40 +0,0 @@
-//$Id: LockModeType.java 11282 2007-03-14 22:05:59Z epbernard $
-package javax.persistence;
-
-/**
- * Lock modes that can be specified by means of the EntityManager.lock() method.
- *
- * The semantics of requesting locks of type LockModeType.READ and LockModeType.WRITE are t
- * he following.
- *
- * If transaction T1 calls lock(entity, LockModeType.READ) on a versioned object, the entity
- * manager must ensure that neither of the following phenomena can occur:
- *
- * * P1 (Dirty read): Transaction T1 modifies a row. Another transaction T2 then reads
- * that row and obtains the modified value, before T1 has committed or rolled back.
- * Transaction T2 eventually commits successfully; it does not matter whether T1 commits or rolls
- * back and whether it does so before or after T2 commits.
- *
- * * P2 (Non-repeatable read): Transaction T1 reads a row. Another transaction T2 then modifies
- * or deletes that row, before T1 has committed. Both transactions eventually commit successfully.
- *
- * Lock modes must always prevent the phenomena P1 and P2.
- * In addition, calling lock(entity, LockModeType.WRITE) on a versioned object,
- * will also force an update (increment) to the entity's version column.
- *
- * The persistence implementation is not required to support calling EntityManager.lock()
- * on a non-versioned object. When it cannot support a such lock call, it must
- * throw the PersistenceException.
- *
- * @author Emmanuel Bernard
- */
-public enum LockModeType {
- /**
- * Read lock
- */
- READ,
- /**
- * Write lock
- */
- WRITE
-}
/trunk/src/javax/persistence/LockModeType.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/AttributeOverride.java
===================================================================
--- trunk/src/javax/persistence/AttributeOverride.java (revision 38)
+++ trunk/src/javax/persistence/AttributeOverride.java (nonexistent)
@@ -1,34 +0,0 @@
-//$Id: AttributeOverride.java 11282 2007-03-14 22:05:59Z epbernard $
-//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
-package javax.persistence;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.RetentionPolicy.*;
-import static java.lang.annotation.ElementType.*;
-
-
-/**
- * The AttributeOverride annotation is used to override the mapping of a Basic (whether explicit
- * or default) property or field or Id property or field.
- *
- * The AttributeOverride annotation may be applied to an entity that extends a mapped superclass
- * or to an embedded field or property to override a basic mapping defined by the mapped superclass
- * or embeddable class. If the AttributeOverride annotation is not specified, the column is mapped
- * the same as in the original mapping.
- *
- * @author Emmanuel Bernard
- */
-@Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME)
-public @interface AttributeOverride {
- /**
- * The name of the property whose mapping is being overridden if property-based access is being
- * used, or the name of the field if field-based access is used.
- */
- String name();
- /**
- * The column that is being mapped to the persistent attribute
- */
- Column column();
-}
/trunk/src/javax/persistence/AttributeOverride.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/TransactionRequiredException.java
===================================================================
--- trunk/src/javax/persistence/TransactionRequiredException.java (revision 38)
+++ trunk/src/javax/persistence/TransactionRequiredException.java (nonexistent)
@@ -1,26 +0,0 @@
-//$Id: TransactionRequiredException.java 11282 2007-03-14 22:05:59Z epbernard $
-package javax.persistence;
-
-/**
- * Thrown by the persistence provider when a transaction is required but is not active.
- * @author Gavin King
- */
-public class TransactionRequiredException extends PersistenceException {
-
- /**
- * Constructs a new TransactionRequiredException exception with null as its detail message
- */
- public TransactionRequiredException() {
- super();
- }
-
- /**
- * Constructs a new TransactionRequiredException exception with the specified detail message
- *
- * @param message
- */
- public TransactionRequiredException(String message) {
- super( message );
- }
-
-}
/trunk/src/javax/persistence/TransactionRequiredException.java
Property changes:
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/EmbeddedId.java
===================================================================
--- trunk/src/javax/persistence/EmbeddedId.java (revision 38)
+++ trunk/src/javax/persistence/EmbeddedId.java (nonexistent)
@@ -1,19 +0,0 @@
-//$Id: EmbeddedId.java 11282 2007-03-14 22:05:59Z epbernard $
-//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
-package javax.persistence;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Is applied to a persistent field or property of an entity class or mapped superclass to denote
- * a composite primary key that is an embeddable class. The embeddable class must be annotated
- * as Embeddable.
- *
- * @author Emmanuel Bernard
- */
-@Target({ElementType.METHOD, ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface EmbeddedId {}
/trunk/src/javax/persistence/EmbeddedId.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/JoinTable.java
===================================================================
--- trunk/src/javax/persistence/JoinTable.java (revision 38)
+++ trunk/src/javax/persistence/JoinTable.java (nonexistent)
@@ -1,63 +0,0 @@
-//$Id: JoinTable.java 11282 2007-03-14 22:05:59Z epbernard $
-//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
-package javax.persistence;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.ElementType.*;
-import static java.lang.annotation.RetentionPolicy.*;
-
-/**
- * This annotation is used in the mapping of associations. It is specified on the owning
- * side of a many-to-many association, or in a unidirectional one-to-many association.
- *
- * If the JoinTable annotation is missing, the default values of the annotation elements apply.
- * The name of the join table is assumed to be the table names of the associated primary tables
- * concatenated together (owning side first) using an underscore.
- *
- * @author Emmanuel Bernard
- */
-@Target({METHOD, FIELD}) @Retention(RUNTIME)
-public @interface JoinTable {
- /**
- * The name of the join table.
- *
- * Defaults to the concatenated names of the two associated primary entity tables,
- * separated by an underscore
- */
- String name() default "";
- /**
- * The catalog of the table.
- *
- * Defaults to the default catalog.
- */
- String catalog() default "";
- /**
- * The schema of the table.
- *
- * Defaults to the default schema for user.
- */
- String schema() default "";
- /**
- * The foreign key columns of the join table which reference the primary table of the
- * entity owning the association (i.e. the owning side of the association).
- *
- * Uses the same defaults as for JoinColumn.
- */
- JoinColumn[] joinColumns() default {};
- /**
- * The foreign key columns of the join table which reference the primary table of the entity
- * that does not own the association (i.e. the inverse side of the association).
- *
- * Uses the same defaults as for JoinColumn
- */
- JoinColumn[] inverseJoinColumns() default {};
- /**
- * Unique constraints that are to be placed on the table. These are only used if table
- * generation is in effect.
- *
- * Defaults to no additional constraints
- */
- UniqueConstraint[] uniqueConstraints() default {};
-}
/trunk/src/javax/persistence/JoinTable.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/SqlResultSetMappings.java
===================================================================
--- trunk/src/javax/persistence/SqlResultSetMappings.java (revision 38)
+++ trunk/src/javax/persistence/SqlResultSetMappings.java (nonexistent)
@@ -1,19 +0,0 @@
-//$Id: SqlResultSetMapping.java 9044 2006-01-12 20:58:41 -0500 (jeu., 12 janv. 2006) epbernard $
-//EJB3 Specification Copyright 2004 - 2006 Sun Microsystems, Inc.
-
-package javax.persistence;
-
-import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * This annotation is used to define one or more SqlResultSetMapping
- *
- * @author Emmanuel Bernard
- */
-@Target({ElementType.TYPE}) @Retention(RetentionPolicy.RUNTIME)
-public @interface SqlResultSetMappings {
- SqlResultSetMapping[] value();
-}
/trunk/src/javax/persistence/SqlResultSetMappings.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/DiscriminatorType.java
===================================================================
--- trunk/src/javax/persistence/DiscriminatorType.java (revision 38)
+++ trunk/src/javax/persistence/DiscriminatorType.java (nonexistent)
@@ -1,23 +0,0 @@
-//$Id: DiscriminatorType.java 11282 2007-03-14 22:05:59Z epbernard $
-//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
-package javax.persistence;
-
-/**
- * Defines supported types of the discriminator column
- *
- * @author Emmanuel Bernard
- */
-public enum DiscriminatorType {
- /**
- * String as the discriminator type
- */
- STRING,
- /**
- * Single character as the discriminator type
- */
- CHAR,
- /**
- * Integer as the discriminator type
- */
- INTEGER
-};
/trunk/src/javax/persistence/DiscriminatorType.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/EntityResult.java
===================================================================
--- trunk/src/javax/persistence/EntityResult.java (revision 38)
+++ trunk/src/javax/persistence/EntityResult.java (nonexistent)
@@ -1,33 +0,0 @@
-//$Id: EntityResult.java 11282 2007-03-14 22:05:59Z epbernard $
-//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
-package javax.persistence;
-
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * References an entity in the SELECT clause of a SQL query. If this annotation is used,
- * the SQL statement should select all of the columns that are mapped to the entity object.
- * This should include foreign key columns to related entities. The results obtained when
- * insufficient data is available are undefined.
- *
- * @author Emmanuel Bernard
- */
-@Target({}) @Retention(RetentionPolicy.RUNTIME)
-public @interface EntityResult {
- /**
- * The class of the result
- */
- Class entityClass();
- /**
- * Maps the columns specified in the SELECT list of the query to the properties or
- * fields of the entity class.
- */
- FieldResult[] fields() default {};
- /**
- * Specifies the column name (or alias) of the column in the SELECT list that is used to
- * determine the type of the entity instance.
- */
- String discriminatorColumn() default "";
-}
/trunk/src/javax/persistence/EntityResult.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/SequenceGenerator.java
===================================================================
--- trunk/src/javax/persistence/SequenceGenerator.java (revision 38)
+++ trunk/src/javax/persistence/SequenceGenerator.java (nonexistent)
@@ -1,38 +0,0 @@
-//$Id: SequenceGenerator.java 11282 2007-03-14 22:05:59Z epbernard $
-//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
-package javax.persistence;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.ElementType.*;
-import static java.lang.annotation.RetentionPolicy.*;
-
-/**
- * This annotation defines a primary key generator that may be referenced by name when a generator
- * element is specified for the GeneratedValue annotation. A sequence generator may be specified on
- * the entity class or on the primary key field or property. The scope of the generator name is global
- * to the persistence unit (across all generator types).
- *
- * @author Emmanuel Bernard
- */
-@Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME)
-public @interface SequenceGenerator {
- /**
- * A unique generator name that can be referenced by one or more classes to be the generator for primary key values
- */
- String name();
- /**
- * The name of the database sequence object from which to obtain primary key values
- * Defaults to a provider-chosen value
- */
- String sequenceName() default "";
- /**
- * The value from which the sequence object is to start generating
- */
- int initialValue() default 1;
- /**
- * The amount to increment by when allocating sequence numbers from the sequence
- */
- int allocationSize() default 50;
-}
/trunk/src/javax/persistence/SequenceGenerator.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/NamedNativeQuery.java
===================================================================
--- trunk/src/javax/persistence/NamedNativeQuery.java (revision 38)
+++ trunk/src/javax/persistence/NamedNativeQuery.java (nonexistent)
@@ -1,39 +0,0 @@
-//$Id: NamedNativeQuery.java 11282 2007-03-14 22:05:59Z epbernard $
-//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
-package javax.persistence;
-
-import static java.lang.annotation.ElementType.*;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-/**
- * Is used to specify a native SQL named query. Query names are scoped to the persistence unit.
- *
- * @author Emmanuel Bernard
- */
-@Target({TYPE})
-@Retention(RUNTIME)
-public @interface NamedNativeQuery {
- /**
- * Is used to refer to the query when using the EntityManager methods that create query objects
- */
- String name();
- /**
- * The SQL query string
- */
- String query();
-
- /**
- * Vendor-specific query hints
- */
- QueryHint[] hints() default {};
- /**
- * The class of the result
- */
- Class resultClass() default void.class;
- /**
- * The name of a SqlResultSetMapping, as defined in metadata
- */
- String resultSetMapping() default ""; // name of SQLResultSetMapping
-}
/trunk/src/javax/persistence/NamedNativeQuery.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/NamedQueries.java
===================================================================
--- trunk/src/javax/persistence/NamedQueries.java (revision 38)
+++ trunk/src/javax/persistence/NamedQueries.java (nonexistent)
@@ -1,21 +0,0 @@
-//$Id: NamedQueries.java 11282 2007-03-14 22:05:59Z epbernard $
-//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
-package javax.persistence;
-
-import static java.lang.annotation.ElementType.TYPE;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-/**
- * Specifies an array of named Java Persistence query language queries. Query names are scoped to the persistence unit.
- *
- * @author Emmanuel Bernard
- */
-@Target({TYPE}) @Retention(RUNTIME)
-public @interface NamedQueries {
- /**
- * An array of named Java Persistence query language queries.
- */
- NamedQuery [] value ();
-}
/trunk/src/javax/persistence/NamedQueries.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/FieldResult.java
===================================================================
--- trunk/src/javax/persistence/FieldResult.java (revision 38)
+++ trunk/src/javax/persistence/FieldResult.java (nonexistent)
@@ -1,25 +0,0 @@
-//$Id: FieldResult.java 11282 2007-03-14 22:05:59Z epbernard $
-//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
-package javax.persistence;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * Is used to map the columns specified in the SELECT list of the query to the properties
- * or fields of the entity class.
- *
- * @author Emmanuel Bernard
- */
-@Target({}) @Retention(RetentionPolicy.RUNTIME)
-public @interface FieldResult {
- /**
- * Name of the persistent field or property of the class.
- */
- String name();
- /**
- * Name of the column in the SELECT clause - i.e., column aliases, if applicable.
- */
- String column();
-}
/trunk/src/javax/persistence/FieldResult.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/package-info.java
===================================================================
--- trunk/src/javax/persistence/package-info.java (revision 38)
+++ trunk/src/javax/persistence/package-info.java (nonexistent)
@@ -1,9 +0,0 @@
-//$Id:$
-//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
-
-/**
- * The javax.persistence package contains the classes and interfaces that define the contracts
- * between a persistence provider and the managed classes and the clients of the Java Persistence API.
- */
-package javax.persistence;
-
/trunk/src/javax/persistence/package-info.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/Version.java
===================================================================
--- trunk/src/javax/persistence/Version.java (revision 38)
+++ trunk/src/javax/persistence/Version.java (nonexistent)
@@ -1,28 +0,0 @@
-//$Id: Version.java 11282 2007-03-14 22:05:59Z epbernard $
-//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
-package javax.persistence;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.ElementType.*;
-import static java.lang.annotation.RetentionPolicy.*;
-
-/**
- * This annotation specifies the version field or property of an entity class that serves as its
- * optimistic lock value. The version is used to ensure integrity when performing the merge
- * operation and for optimistic concurrency control.
- *
- * Only a single Version property or field should be used per class; applications that use more
- * than one Version property or field will not be portable.
- *
- * The Version property should be mapped to the primary table for the entity class; applications
- * that map the Version property to a table other than the primary table will not be portable.
- *
- * The following types are supported for version properties: int, Integer, short, Short, long,
- * Long, Timestamp.
- *
- * @author Emmanuel Bernard
- */
-@Target({METHOD, FIELD}) @Retention(RUNTIME)
-public @interface Version {}
/trunk/src/javax/persistence/Version.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/CascadeType.java
===================================================================
--- trunk/src/javax/persistence/CascadeType.java (revision 38)
+++ trunk/src/javax/persistence/CascadeType.java (nonexistent)
@@ -1,32 +0,0 @@
-//$Id: CascadeType.java 11282 2007-03-14 22:05:59Z epbernard $
-//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
-package javax.persistence;
-
-/**
- * Defines the set of cascadable operations that are propagated to the associated entity.
- * The value cascade=ALL is equivalent to cascade={PERSIST, MERGE, REMOVE, REFRESH}.
- *
- * @author Emmanuel Bernard
- */
-public enum CascadeType {
- /**
- * Cascade all operations
- */
- ALL,
- /**
- * Cascade persist operations
- */
- PERSIST,
- /**
- * Cascade merge operations
- */
- MERGE,
- /**
- * Cascade remove operations
- */
- REMOVE,
- /**
- * Cascade refresh operations
- */
- REFRESH
-}
/trunk/src/javax/persistence/CascadeType.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/SqlResultSetMapping.java
===================================================================
--- trunk/src/javax/persistence/SqlResultSetMapping.java (revision 38)
+++ trunk/src/javax/persistence/SqlResultSetMapping.java (nonexistent)
@@ -1,29 +0,0 @@
-//$Id: SqlResultSetMapping.java 11282 2007-03-14 22:05:59Z epbernard $
-//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
-package javax.persistence;
-
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * This annotation is used to specify the mapping of the result of a native SQL query
- *
- * @author Emmanuel Bernard
- */
-@Target({ElementType.TYPE}) @Retention(RetentionPolicy.RUNTIME)
-public @interface SqlResultSetMapping {
- /**
- * The name given to the result set mapping, and used to refer to it in the methods of the Query API
- */
- String name();
- /**
- * Specifies the result set mapping to entities
- */
- EntityResult[] entities() default {};
- /**
- * Specifies the result set mapping to scalar values
- */
- ColumnResult[] columns() default {};
-}
/trunk/src/javax/persistence/SqlResultSetMapping.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/OneToOne.java
===================================================================
--- trunk/src/javax/persistence/OneToOne.java (revision 38)
+++ trunk/src/javax/persistence/OneToOne.java (nonexistent)
@@ -1,51 +0,0 @@
-//$Id: OneToOne.java 11282 2007-03-14 22:05:59Z epbernard $
-//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
-package javax.persistence;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.ElementType.*;
-import static java.lang.annotation.RetentionPolicy.*;
-import static javax.persistence.FetchType.*;
-
-/**
- * This annotation defines a single-valued association to another entity that has
- * one-to-one multiplicity. It is not normally necessary to specify the associated
- * target entity explicitly since it can usually be inferred from the type of the object
- * being referenced.
- *
- * @author Emmanuel Bernard
- */
-@Target({METHOD, FIELD}) @Retention(RUNTIME)
-public @interface OneToOne {
- /**
- * The entity class that is the target of the association.
- *
- * Defaults to the type of the field or property that stores the association.
- */
- Class targetEntity() default void.class;
- /**
- * The operations that must be cascaded to the target of the association.
- *
- * By default no operations are cascaded.
- */
- CascadeType[] cascade() default {};
- /**
- * Whether the association should be lazily loaded or must be eagerly fetched.
- * The EAGER strategy is a requirement on the persistence provider runtime that
- * the associated entity must be eagerly fetched. The LAZY strategy is a hint to
- * the persistence provider runtime.
- */
- FetchType fetch() default EAGER;
- /**
- * Whether the association is optional. If set to false then a non-null relationship must
- * always exist.
- */
- boolean optional() default true;
- /**
- * The field that owns the relationship. This element is only specified on the
- * inverse (non-owning) side of the association.
- */
- String mappedBy() default "";
-}
/trunk/src/javax/persistence/OneToOne.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/AttributeOverrides.java
===================================================================
--- trunk/src/javax/persistence/AttributeOverrides.java (revision 38)
+++ trunk/src/javax/persistence/AttributeOverrides.java (nonexistent)
@@ -1,23 +0,0 @@
-//$Id: AttributeOverrides.java 11282 2007-03-14 22:05:59Z epbernard $
-//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
-package javax.persistence;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.RetentionPolicy.*;
-import static java.lang.annotation.ElementType.*;
-
-
-/**
- * Is used to override mappings of multiple properties or fields
- *
- * @author Emmanuel Bernard
- */
-@Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME)
-public @interface AttributeOverrides {
- /**
- * One or more mapping override
- */
- AttributeOverride[] value();
-}
/trunk/src/javax/persistence/AttributeOverrides.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/ExcludeDefaultListeners.java
===================================================================
--- trunk/src/javax/persistence/ExcludeDefaultListeners.java (revision 38)
+++ trunk/src/javax/persistence/ExcludeDefaultListeners.java (nonexistent)
@@ -1,17 +0,0 @@
-//$Id: ExcludeDefaultListeners.java 11282 2007-03-14 22:05:59Z epbernard $
-package javax.persistence;
-
-import static java.lang.annotation.ElementType.TYPE;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-/**
- * Specifies that the invocation of default listeners is to be excluded for the entity class
- * (or mapped superclass) and its subclasses.
- *
- * @author Emmanuel Bernard
- */
-@Target(TYPE) @Retention(RUNTIME)
-public @interface ExcludeDefaultListeners {
-}
/trunk/src/javax/persistence/ExcludeDefaultListeners.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/PersistenceProperty.java
===================================================================
--- trunk/src/javax/persistence/PersistenceProperty.java (revision 38)
+++ trunk/src/javax/persistence/PersistenceProperty.java (nonexistent)
@@ -1,27 +0,0 @@
-//$Id: $
-package javax.persistence;
-
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-/**
- * Describes a single container or persistence provider property.
- * Vendor specific properties may be included in the set of properties, and are passed to the persistence
- * provider by the container when the entity manager is created.
- * Properties that are not recognized by a vendor will be ignored.
- *
- * @author Emmanuel Bernard
- */
-@Target({})
-@Retention(RUNTIME)
-public @interface PersistenceProperty {
- /**
- * The name of the property
- */
- String name();
- /**
- * The value of the property
- */
- String value();
-}
\ No newline at end of file
/trunk/src/javax/persistence/PersistenceProperty.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/Embedded.java
===================================================================
--- trunk/src/javax/persistence/Embedded.java (revision 38)
+++ trunk/src/javax/persistence/Embedded.java (nonexistent)
@@ -1,18 +0,0 @@
-//$Id: Embedded.java 11282 2007-03-14 22:05:59Z epbernard $
-//EJB Specification Copyright 2004 Sun Microsystems, Inc.
-package javax.persistence;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.ElementType.*;
-import static java.lang.annotation.RetentionPolicy.*;
-
-/**
- * Defines a persistent field or property of an entity whose value is an instance of
- * an embeddable class. The embeddable class must be annotated as Embeddable.
- *
- * @author Emmanuel Bernard
- */
-@Target({METHOD, FIELD}) @Retention(RUNTIME)
-public @interface Embedded {}
/trunk/src/javax/persistence/Embedded.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/InheritanceType.java
===================================================================
--- trunk/src/javax/persistence/InheritanceType.java (revision 38)
+++ trunk/src/javax/persistence/InheritanceType.java (nonexistent)
@@ -1,25 +0,0 @@
-//$Id: InheritanceType.java 11282 2007-03-14 22:05:59Z epbernard $
-//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
-package javax.persistence;
-
-/**
- * Defines inheritance strategy options.
- *
- * @author Emmanuel Bernard
- */
-public enum InheritanceType
-{
- /**
- * A single table per class hierarchy
- */
- SINGLE_TABLE,
- /**
- * A table per concrete entity class
- */
- TABLE_PER_CLASS,
- /**
- * A strategy in which fields that are specific to a subclass are mapped to a separate
- * table than the fields that are common to the parent class, and a join is performed
- * to instantiate the subclass.
- */
- JOINED };
/trunk/src/javax/persistence/InheritanceType.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/FetchType.java
===================================================================
--- trunk/src/javax/persistence/FetchType.java (revision 38)
+++ trunk/src/javax/persistence/FetchType.java (nonexistent)
@@ -1,24 +0,0 @@
-//$Id: FetchType.java 11282 2007-03-14 22:05:59Z epbernard $
-//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
-package javax.persistence;
-
-/**
- * Defines strategies for fetching data from the database.
- * The EAGER strategy is a requirement on the persistence provider runtime that data must
- * be eagerly fetched. The LAZY strategy is a hint to the persistence provider runtime that
- * data should be fetched lazily when it is first accessed. The implementation is permitted to
- * eagerly fetch data for which the LAZY strategy hint has been specified. In particular, lazy
- * fetching might only be available for Basic mappings for which property-based access is used.
- *
- * @author Emmanuel Bernard
- */
-public enum FetchType {
- /**
- * Defines that data must be lazily fetched
- */
- LAZY,
- /**
- * Defines that data must be eagerly fetched
- */
- EAGER
-};
/trunk/src/javax/persistence/FetchType.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/AssociationOverrides.java
===================================================================
--- trunk/src/javax/persistence/AssociationOverrides.java (revision 38)
+++ trunk/src/javax/persistence/AssociationOverrides.java (nonexistent)
@@ -1,24 +0,0 @@
-//$Id:$
-//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
-package javax.persistence;
-
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.FIELD;
-
-/**
- * This annotation is used to override mappings of multiple many-to-one
- * or one-to-one relationship properties or fields.
- *
- * @author Emmanuel Bernard
- */
-@Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME)
-public @interface AssociationOverrides {
- /**
- * Mapping overrides of relationship properties or fields
- */
- AssociationOverride[] value();
-}
/trunk/src/javax/persistence/AssociationOverrides.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/PostRemove.java
===================================================================
--- trunk/src/javax/persistence/PostRemove.java (revision 38)
+++ trunk/src/javax/persistence/PostRemove.java (nonexistent)
@@ -1,25 +0,0 @@
-/* $Id: PostRemove.java 11282 2007-03-14 22:05:59Z epbernard $
- * JBoss Inc
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-package javax.persistence;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-
-/**
- * Is used to specify callback methods for the corresponding lifecycle event. This annotation may be applied
- * to methods of an entity class, a mapped superclass, or a callback listener class.
- *
- * @author <a href="mailto:bill@jboss.org">Bill Burke</a>
- */
-@Target({ElementType.METHOD})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface PostRemove {
-}
/trunk/src/javax/persistence/PostRemove.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/EnumType.java
===================================================================
--- trunk/src/javax/persistence/EnumType.java (revision 38)
+++ trunk/src/javax/persistence/EnumType.java (nonexistent)
@@ -1,19 +0,0 @@
-//$Id: EnumType.java 11282 2007-03-14 22:05:59Z epbernard $
-package javax.persistence;
-
-/**
- * Defines mapping for the enumerated types. The constants of this enumerated type specify how persistent
- * property or field should be persisted as a enumerated type.
- *
- * @author Emmanuel Bernard
- */
-public enum EnumType {
- /**
- * Persist enumerated type property or field as an integer
- */
- ORDINAL,
- /**
- * Persist enumerated type property or field as a string
- */
- STRING
-}
/trunk/src/javax/persistence/EnumType.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/EntityManager.java
===================================================================
--- trunk/src/javax/persistence/EntityManager.java (revision 38)
+++ trunk/src/javax/persistence/EntityManager.java (nonexistent)
@@ -1,298 +0,0 @@
-// $Id: EntityManager.java 11282 2007-03-14 22:05:59Z epbernard $
-package javax.persistence;
-
-/**
- * Interface used to interact with the persistence context.
- *
- * An EntityManager instance is associated with a persistence context. A persistence context is a set of
- * entity instances in which for any persistent entity identity there is a unique entity instance.
- * Within the persistence context, the entity instances and their lifecycle are managed. This interface
- * defines the methods that are used to interact with the persistence context. The EntityManager API is
- * used to create and remove persistent entity instances, to find entities by their primary key, and to
- * query over entities.
- *
- * The set of entities that can be managed by a given EntityManager instance is defined by a persistence unit.
- * A persistence unit defines the set of all classes that are related or grouped by the application, and
- * which must be colocated in their mapping to a single database.
- *
- * @author Emmanuel Bernard
- */
-public interface EntityManager {
- /**
- * Make an entity instance managed and persistent.
- *
- * @param entity
- * @throws EntityExistsException if the entity already exists.
- * (The EntityExistsException may be thrown when the persist
- * operation is invoked, or the EntityExistsException or
- * another PersistenceException may be thrown at commit
- * time.)
- * @throws IllegalStateException if this EntityManager has been closed.
- * @throws IllegalArgumentException if not an entity
- * @throws TransactionRequiredException if invoked on a
- * container-managed entity manager of type
- * PersistenceContextType.TRANSACTION and there is
- * no transaction.
- */
- public void persist(Object entity);
-
- /**
- * Merge the state of the given entity into the
- * current persistence context.
- *
- * @param entity
- * @return the instance that the state was merged to
- * @throws IllegalStateException if this EntityManager has been closed
- * @throws IllegalArgumentException if instance is not an
- * entity or is a removed entity
- * @throws TransactionRequiredException if invoked on a
- * container-managed entity manager of type
- * PersistenceContextType.TRANSACTION and there is
- * no transaction.
- */
- public <T> T merge(T entity);
-
- /**
- * Remove the entity instance.
- *
- * @param entity
- * @throws IllegalStateException if this EntityManager has been closed
- * @throws IllegalArgumentException if not an entity
- * or if a detached entity
- * @throws TransactionRequiredException if invoked on a
- * container-managed entity manager of type
- * PersistenceContextType.TRANSACTION and there is
- * no transaction.
- */
- public void remove(Object entity);
-
- /**
- * Find by primary key.
- *
- * @param entityClass
- * @param primaryKey
- * @return the found entity instance or null
- * if the entity does not exist
- * @throws IllegalStateException if this EntityManager has been closed
- * @throws IllegalArgumentException if the first argument does
- * not denote an entity type or the second
- * argument is not a valid type for that
- * entity’s primary key
- */
- public <T> T find(Class<T> entityClass, Object primaryKey);
-
- /**
- * Get an instance, whose state may be lazily fetched.
- * If the requested instance does not exist in the database,
- * the EntityNotFoundException is thrown when the instance
- * state is first accessed. (The persistence provider runtime is
- * permitted to throw the EntityNotFoundException when
- * getReference is called.)
- * The application should not expect that the instance state will
- * be available upon detachment, unless it was accessed by the
- * application while the entity manager was open.
- *
- * @param entityClass
- * @param primaryKey
- * @return the found entity instance
- * @throws IllegalStateException if this EntityManager has been closed
- * @throws IllegalArgumentException if the first argument does
- * not denote an entity type or the second
- * argument is not a valid type for that
- * entity’s primary key
- * @throws EntityNotFoundException if the entity state
- * cannot be accessed
- */
- public <T> T getReference(Class<T> entityClass, Object primaryKey);
-
- /**
- * Synchronize the persistence context to the
- * underlying database.
- *
- * @throws IllegalStateException if this EntityManager has been closed
- * @throws TransactionRequiredException if there is
- * no transaction
- * @throws PersistenceException if the flush fails
- */
- public void flush();
-
- /**
- * Set the flush mode that applies to all objects contained
- * in the persistence context.
- *
- * @param flushMode
- * @throws IllegalStateException if this EntityManager has been closed
- */
- public void setFlushMode(FlushModeType flushMode);
-
- /**
- * Get the flush mode that applies to all objects contained
- * in the persistence context.
- *
- * @return flushMode
- * @throws IllegalStateException if this EntityManager has been closed
- */
- public FlushModeType getFlushMode();
-
- /**
- * Set the lock mode for an entity object contained
- * in the persistence context.
- *
- * @param entity
- * @param lockMode
- * @throws IllegalStateException if this EntityManager has been closed
- * @throws PersistenceException if an unsupported lock call
- * is made
- * @throws IllegalArgumentException if the instance is not
- * an entity or is a detached entity
- * @throws TransactionRequiredException if there is no
- * transaction
- */
- public void lock(Object entity, LockModeType lockMode);
-
- /**
- * Refresh the state of the instance from the database,
- * overwriting changes made to the entity, if any.
- *
- * @param entity
- * @throws IllegalStateException if this EntityManager has been closed
- * @throws IllegalArgumentException if not an entity
- * or entity is not managed
- * @throws TransactionRequiredException if invoked on a
- * container-managed entity manager of type
- * PersistenceContextType.TRANSACTION and there is
- * no transaction.
- * @throws EntityNotFoundException if the entity no longer
- * exists in the database
- */
- public void refresh(Object entity);
-
- /**
- * Clear the persistence context, causing all managed
- * entities to become detached. Changes made to entities that
- * have not been flushed to the database will not be
- * persisted.
- *
- * @throws IllegalStateException if this EntityManager has been closed
- */
- public void clear();
-
- /**
- * Check if the instance belongs to the current persistence
- * context.
- *
- * @param entity
- * @return <code>true</code> if the instance belongs to the current persistence context.
- * @throws IllegalStateException if this EntityManager has been closed
- * @throws IllegalArgumentException if not an entity
- */
- public boolean contains(Object entity);
-
- /**
- * Create an instance of Query for executing an
- * EJB QL statement.
- *
- * @param ejbqlString an EJB QL query string
- * @return the new query instance
- * @throws IllegalStateException if this EntityManager has been closed
- * @throws IllegalArgumentException if query string is not valid
- */
- public Query createQuery(String ejbqlString);
-
- /**
- * Create an instance of Query for executing a
- * named query (in EJB QL or native SQL).
- *
- * @param name the name of a query defined in metadata
- * @return the new query instance
- * @throws IllegalStateException if this EntityManager has been closed
- * @throws IllegalArgumentException if a query has not been
- * defined with the given name
- */
- public Query createNamedQuery(String name);
-
- /**
- * Create an instance of Query for executing
- * a native SQL statement, e.g., for update or delete.
- *
- * @param sqlString a native SQL query string
- * @return the new query instance
- * @throws IllegalStateException if this EntityManager has been closed
- */
- public Query createNativeQuery(String sqlString);
-
- /**
- * Create an instance of Query for executing
- * a native SQL query.
- *
- * @param sqlString a native SQL query string
- * @param resultClass the class of the resulting instance(s)
- * @return the new query instance
- * @throws IllegalStateException if this EntityManager has been closed
- */
- public Query createNativeQuery(String sqlString, Class resultClass);
-
- /**
- * Create an instance of Query for executing
- * a native SQL query.
- *
- * @param sqlString a native SQL query string
- * @param resultSetMapping the name of the result set mapping
- * @return the new query instance
- * @throws IllegalStateException if this EntityManager has been closed
- */
- public Query createNativeQuery(String sqlString, String resultSetMapping);
-
- /**
- * Indicate to the EntityManager that a JTA transaction is
- * active. This method should be called on a JTA application
- * managed EntityManager that was created outside the scope
- * of the active transaction to associate it with the current
- * JTA transaction.
- *
- * @throws IllegalStateException if this EntityManager has been closed
- * @throws TransactionRequiredException if there is
- * no transaction.
- */
- public void joinTransaction();
-
- /**
- * Return the underlying provider object for the EntityManager, if available.
- * The result of this method is implementation specific
- *
- * @throws IllegalStateException if this EntityManager has been closed
- */
- public Object getDelegate();
-
- /**
- * Close an application-managed EntityManager.
- * After the close method has been invoked, all methods
- * on the EntityManager instance and any Query objects obtained
- * from it will throw the IllegalStateException except
- * for getTransaction and isOpen (which will return false).
- * If this method is called when the EntityManager is
- * associated with an active transaction, the persistence
- * context remains managed until the transaction completes.
- *
- * @throws IllegalStateException if the EntityManager is container-managed or has been already closed
- */
- public void close();
-
- /**
- * Determine whether the EntityManager is open.
- *
- * @return true until the EntityManager has been closed.
- */
- public boolean isOpen();
-
- /**
- * Return the resource-level transaction object.
- * The EntityTransaction instance may be used serially to
- * begin and commit multiple transactions.
- *
- * @return EntityTransaction instance
- * @throws IllegalStateException if invoked on a JTA
- * EntityManager.
- */
- public EntityTransaction getTransaction();
-}
\ No newline at end of file
/trunk/src/javax/persistence/EntityManager.java
Property changes:
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/PersistenceUnits.java
===================================================================
--- trunk/src/javax/persistence/PersistenceUnits.java (revision 38)
+++ trunk/src/javax/persistence/PersistenceUnits.java (nonexistent)
@@ -1,26 +0,0 @@
-/* $Id: PersistenceUnits.java 11282 2007-03-14 22:05:59Z epbernard $
- * JBoss Inc
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-package javax.persistence;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Declares one or more PersistenceUnit annotations
- *
- * @author <a href="mailto:bill@jboss.org">Bill Burke</a>
- */
-@Target({ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface PersistenceUnits {
- /**
- * One or more PersistenceUnit annotations
- */
- PersistenceUnit[] value();
-}
/trunk/src/javax/persistence/PersistenceUnits.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/RollbackException.java
===================================================================
--- trunk/src/javax/persistence/RollbackException.java (revision 38)
+++ trunk/src/javax/persistence/RollbackException.java (nonexistent)
@@ -1,44 +0,0 @@
-//$Id: $
-package javax.persistence;
-
-/**
- * Thrown by the persistence provider when the EntityTransaction.commit() fails
- *
- * @author Emmanuel Bernard
- */
-public class RollbackException extends PersistenceException {
- /**
- * Constructs a new RollbackException exception with null as its detail message
- */
- public RollbackException() {
- super();
- }
-
- /**
- * Constructs a new RollbackException exception with the specified cause
- *
- * @param cause The detail cause
- */
- public RollbackException(Throwable cause) {
- super( cause );
- }
-
- /**
- * Constructs a new RollbackException exception with the specified detail message
- *
- * @param message The detail message
- */
- public RollbackException(String message) {
- super( message );
- }
-
- /**
- * Constructs a new RollbackException exception with the specified detail message and cause
- *
- * @param message The detail message
- * @param cause The detail cause
- */
- public RollbackException(String message, Throwable cause) {
- super( message, cause );
- }
-}
/trunk/src/javax/persistence/RollbackException.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/OneToMany.java
===================================================================
--- trunk/src/javax/persistence/OneToMany.java (revision 38)
+++ trunk/src/javax/persistence/OneToMany.java (nonexistent)
@@ -1,47 +0,0 @@
-//$Id: OneToMany.java 11282 2007-03-14 22:05:59Z epbernard $
-//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
-package javax.persistence;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.ElementType.*;
-import static java.lang.annotation.RetentionPolicy.*;
-import static javax.persistence.FetchType.*;
-
-/**
- * Defines a many-valued association with one-to-many multiplicity.
- *
- * If the collection is defined using generics to specify the element type,
- * the associated target entity type need not be specified; otherwise the target
- * entity class must be specified.
- *
- * @author Emmanuel Bernard
- */
-@Target({METHOD, FIELD}) @Retention(RUNTIME)
-public @interface OneToMany {
- /**
- * The entity class that is the target of the association. Optional only if the collection
- * property is defined using Java generics. Must be specified otherwise.
- *
- * Defaults to the parameterized type of the collection when defined using generics.
- */
- Class targetEntity() default void.class;
- /**
- * The operations that must be cascaded to the target of the association.
- *
- * Defaults to no operations being cascaded.
- */
- CascadeType[] cascade() default {};
- /**
- * Whether the association should be lazily loaded or must be eagerly fetched.
- * The EAGER strategy is a requirement on the persistenceprovider runtime that the
- * associatedentities must be eagerly fetched. The LAZY strategy is a hint to the
- * persistence provider runtime.
- */
- FetchType fetch() default LAZY;
- /**
- * The field that owns the relationship. Required unless the relationship is unidirectional.
- */
- String mappedBy() default "";
-}
/trunk/src/javax/persistence/OneToMany.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/PersistenceContexts.java
===================================================================
--- trunk/src/javax/persistence/PersistenceContexts.java (revision 38)
+++ trunk/src/javax/persistence/PersistenceContexts.java (nonexistent)
@@ -1,27 +0,0 @@
-/* $Id: PersistenceContexts.java 11282 2007-03-14 22:05:59Z epbernard $
- * JBoss Inc
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-package javax.persistence;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Declares one or more PersistenceContext annotations. It is used to express a dependency on
- * container-managed entity manager persistence contexts.
- *
- * @author <a href="mailto:bill@jboss.org">Bill Burke</a>
- */
-@Target({ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface PersistenceContexts {
- /**
- * One or more persistence context
- */
- PersistenceContext[] value();
-}
/trunk/src/javax/persistence/PersistenceContexts.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/Lob.java
===================================================================
--- trunk/src/javax/persistence/Lob.java (revision 38)
+++ trunk/src/javax/persistence/Lob.java (nonexistent)
@@ -1,25 +0,0 @@
-//$Id: Lob.java 11282 2007-03-14 22:05:59Z epbernard $
-//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
-package javax.persistence;
-
-import static java.lang.annotation.ElementType.METHOD;
-
-import static java.lang.annotation.ElementType.FIELD;
-
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
-
-/**
- * Specifies that a persistent property or field should be persisted as a large object to a
- * database-supported large object type. The Lob annotation may be used in conjunction with
- * the Basic annotation. A Lob may be either a binary or character type.
- *
- * The Lob type is inferred from the type of the persistent field or property, and except
- * for string and character-based types defaults to Blob.
- *
- * @author Emmanuel Bernard
- */
-@Target({METHOD, FIELD}) @Retention(RUNTIME)
-public @interface Lob {}
\ No newline at end of file
/trunk/src/javax/persistence/Lob.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/EntityTransaction.java
===================================================================
--- trunk/src/javax/persistence/EntityTransaction.java (revision 38)
+++ trunk/src/javax/persistence/EntityTransaction.java (nonexistent)
@@ -1,60 +0,0 @@
-//$Id: EntityTransaction.java 11282 2007-03-14 22:05:59Z epbernard $
-package javax.persistence;
-
-/**
- * The EntityTransaction interface is used to control resource transactions
- * on resource-local entity managers. The EntityManager.getTransaction()
- * method returns the EntityTransaction interface.
- *
- * @author Emmanuel Bernard
- */
-public interface EntityTransaction {
- /**
- * Start a resource transaction.
- *
- * @throws IllegalStateException if isActive() is true.
- */
- public void begin();
-
- /**
- * Commit the current transaction, writing any unflushed
- * changes to the database.
- *
- * @throws IllegalStateException if isActive() is false.
- * @throws RollbackException if the commit fails.
- */
- public void commit();
-
- /**
- * Roll back the current transaction.
- *
- * @throws IllegalStateException if isActive() is false.
- * @throws PersistenceException if an unexpected error
- * condition is encountered.
- */
- public void rollback();
-
- /**
- * Mark the current transaction so that the only possible
- * outcome of the transaction is for the transaction to be
- * rolled back.
- *
- * @throws IllegalStateException if isActive() is false.
- */
- public void setRollbackOnly();
-
- /**
- * Determine whether the current transaction has been marked
- * for rollback.
- *
- * @throws IllegalStateException if isActive() is false.
- */
- public boolean getRollbackOnly();
-
- /**
- * Indicate whether a transaction is in progress.
- * @throws PersistenceException if an unexpected error
- * condition is encountered.
- */
- public boolean isActive();
-}
\ No newline at end of file
/trunk/src/javax/persistence/EntityTransaction.java
Property changes:
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/Temporal.java
===================================================================
--- trunk/src/javax/persistence/Temporal.java (revision 38)
+++ trunk/src/javax/persistence/Temporal.java (nonexistent)
@@ -1,26 +0,0 @@
-//$Id: Temporal.java 11282 2007-03-14 22:05:59Z epbernard $
-//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
-package javax.persistence;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-/**
- * This annotation must be specified for persistent fields or properties of type Date and Calendar.
- * It may only be specified for fields or properties of these types.
- *
- * The Temporal annotation may be used in conjunction with the Basic annotation.
- *
- * @author Emmanuel Bernard
- */
-@Target({METHOD, FIELD})
-@Retention(RUNTIME)
-public @interface Temporal {
- /**
- * The type used in mapping java.util.Date or java.util.Calendar
- */
- TemporalType value();
-}
/trunk/src/javax/persistence/Temporal.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/PostLoad.java
===================================================================
--- trunk/src/javax/persistence/PostLoad.java (revision 38)
+++ trunk/src/javax/persistence/PostLoad.java (nonexistent)
@@ -1,24 +0,0 @@
-/* $Id: PostLoad.java 11282 2007-03-14 22:05:59Z epbernard $
- * JBoss Inc
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-package javax.persistence;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-
-/**
- * Is used to specify callback methods for the corresponding lifecycle event. This annotation may be applied to
- * methods of an entity class, a mapped superclass, or a callback listener class.
- *
- * @author <a href="mailto:bill@jboss.org">Bill Burke</a>
- */
-@Target({ElementType.METHOD})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface PostLoad {
-}
/trunk/src/javax/persistence/PostLoad.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/ExcludeSuperclassListeners.java
===================================================================
--- trunk/src/javax/persistence/ExcludeSuperclassListeners.java (revision 38)
+++ trunk/src/javax/persistence/ExcludeSuperclassListeners.java (nonexistent)
@@ -1,17 +0,0 @@
-//$Id: ExcludeSuperclassListeners.java 11282 2007-03-14 22:05:59Z epbernard $
-package javax.persistence;
-
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import static java.lang.annotation.ElementType.TYPE;
-
-/**
- * Specifies that the invocation of superclass listeners is to be excluded for the
- * entity class (or mapped superclass) and its subclasses.
- *
- * @author Emmanuel Bernard
- */
-@Target(TYPE) @Retention(RUNTIME)
-public @interface ExcludeSuperclassListeners {
-}
/trunk/src/javax/persistence/ExcludeSuperclassListeners.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/QueryHint.java
===================================================================
--- trunk/src/javax/persistence/QueryHint.java (revision 38)
+++ trunk/src/javax/persistence/QueryHint.java (nonexistent)
@@ -1,25 +0,0 @@
-//$Id: QueryHint.java 11282 2007-03-14 22:05:59Z epbernard $
-package javax.persistence;
-
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-/**
- * An implementation-specific Query hint
- *
- * @author Emmanuel Bernard
- */
-@Target({})
-@Retention(RUNTIME)
-public @interface QueryHint {
- /**
- * Name of the hint
- */
- String name();
-
- /**
- * Value of the hint
- */
- String value();
-}
/trunk/src/javax/persistence/QueryHint.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/PreUpdate.java
===================================================================
--- trunk/src/javax/persistence/PreUpdate.java (revision 38)
+++ trunk/src/javax/persistence/PreUpdate.java (nonexistent)
@@ -1,25 +0,0 @@
-/* $Id: PreUpdate.java 11282 2007-03-14 22:05:59Z epbernard $
- * JBoss Inc
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-package javax.persistence;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-
-/**
- * Is used to specify callback methods for the corresponding lifecycle event. This annotation may be
- * applied to methods of an entity class, a mapped superclass, or a callback listener class.
- *
- * @author <a href="mailto:bill@jboss.org">Bill Burke</a>
- */
-@Target({ElementType.METHOD})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface PreUpdate {
-}
/trunk/src/javax/persistence/PreUpdate.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/EntityExistsException.java
===================================================================
--- trunk/src/javax/persistence/EntityExistsException.java (revision 38)
+++ trunk/src/javax/persistence/EntityExistsException.java (nonexistent)
@@ -1,45 +0,0 @@
-//$Id: $
-package javax.persistence;
-
-/**
- * Thrown by the persistence provider when EntityManager.persist(Object) is called and the
- * entity already exists. The current transaction, if one is active, will be marked for rollback.
- *
- * @author Emmanuel Bernard
- */
-public class EntityExistsException extends PersistenceException {
- /**
- * Constructs a new EntityExistsException exception with null as its detail message.
- */
- public EntityExistsException() {
- super();
- }
-
- /**
- * Constructs a new EntityExistsException exception with the specified cause.
- *
- * @param cause the cause
- */
- public EntityExistsException(Throwable cause) {
- super( cause );
- }
-
- /**
- * Constructs a new EntityExistsException exception with the specified detail message.
- *
- * @param message the detail message.
- */
- public EntityExistsException(String message) {
- super( message );
- }
-
- /**
- * Constructs a new EntityExistsException exception with the specified detail message and cause.
- *
- * @param message the detail message.
- * @param cause the cause.
- */
- public EntityExistsException(String message, Throwable cause) {
- super( message, cause );
- }
-}
/trunk/src/javax/persistence/EntityExistsException.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/GeneratedValue.java
===================================================================
--- trunk/src/javax/persistence/GeneratedValue.java (revision 38)
+++ trunk/src/javax/persistence/GeneratedValue.java (nonexistent)
@@ -1,32 +0,0 @@
-//$Id: GeneratedValue.java 11282 2007-03-14 22:05:59Z epbernard $
-package javax.persistence;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-/**
- * Provides for the specification of generation strategies for the values of primary keys.
- * The GeneratedValue annotation may be applied to a primary key property or field of an entity
- * or mapped superclass in conjunction with the Id annotation.
- *
- * @author Emmanuel Bernard
- */
-@Target({METHOD, FIELD})
-@Retention(RUNTIME)
-public @interface GeneratedValue {
- /**
- * The primary key generation strategy that the persistence provider must use
- * to generate the annotated entity primary key.
- */
- GenerationType strategy() default GenerationType.AUTO;
- /**
- * The name of the primary key generator to use as specified in the SequenceGenerator or
- * TableGenerator annotation.
- *
- * Defaults to the id generator supplied by persistence provider.
- */
- String generator() default "";
-}
/trunk/src/javax/persistence/GeneratedValue.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/ColumnResult.java
===================================================================
--- trunk/src/javax/persistence/ColumnResult.java (revision 38)
+++ trunk/src/javax/persistence/ColumnResult.java (nonexistent)
@@ -1,22 +0,0 @@
-//$Id: ColumnResult.java 11282 2007-03-14 22:05:59Z epbernard $
-//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
-package javax.persistence;
-
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * References name of a column in the SELECT clause of a SQL query - i.e.,
- * column alias, if applicable. Scalar result types can be included in the query
- * result by specifying this annotation in the metadata.
- *
- * @author Emmanuel Bernard
- */
-@Target({}) @Retention(RetentionPolicy.RUNTIME)
-public @interface ColumnResult {
- /**
- * The name of a column in the SELECT clause of a SQL query
- */
- String name();
-}
\ No newline at end of file
/trunk/src/javax/persistence/ColumnResult.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/Id.java
===================================================================
--- trunk/src/javax/persistence/Id.java (revision 38)
+++ trunk/src/javax/persistence/Id.java (nonexistent)
@@ -1,18 +0,0 @@
-//$Id: Id.java 11282 2007-03-14 22:05:59Z epbernard $
-//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
-package javax.persistence;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-
-/**
- * Specifies the primary key property or field of an entity.
- *
- * @author Emmanuel Bernard
- */
-@Target({METHOD, FIELD}) @Retention(RUNTIME)
-public @interface Id {}
/trunk/src/javax/persistence/Id.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/GenerationType.java
===================================================================
--- trunk/src/javax/persistence/GenerationType.java (revision 38)
+++ trunk/src/javax/persistence/GenerationType.java (nonexistent)
@@ -1,34 +0,0 @@
-//$Id: GenerationType.java 11282 2007-03-14 22:05:59Z epbernard $
-//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
-package javax.persistence;
-
-/**
- * Defines the types of primary key generation.
- *
- * @author Emmanuel Bernard
- */
-public enum GenerationType {
- /**
- * Indicates that the persistence provider must assign primary keys for the entity using an underlying
- * database table to ensure uniqueness.
- */
- TABLE,
- /**
- * Indicates that the persistence provider must assign primary keys for the entity using database
- * sequence column.
- */
- SEQUENCE,
- /**
- * Indicates that the persistence provider must assign primary keys for the entity using
- * database identity column.
- */
- IDENTITY,
- /**
- * Indicates that the persistence provider should pick an appropriate strategy for the
- * particular database. The AUTO generation strategy may expect a database resource
- * to exist, or it may attempt to create one. A vendor may provide documentation on how
- * to create such resources in the event that it does not support schema generation or cannot
- * create the schema resource at runtime.
- */
- AUTO
-};
/trunk/src/javax/persistence/GenerationType.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/Column.java
===================================================================
--- trunk/src/javax/persistence/Column.java (revision 38)
+++ trunk/src/javax/persistence/Column.java (nonexistent)
@@ -1,65 +0,0 @@
-//$Id: Column.java 11282 2007-03-14 22:05:59Z epbernard $
-//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
-package javax.persistence;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.ElementType.*;
-import static java.lang.annotation.RetentionPolicy.*;
-
-/**
- * Is used to specify a mapped column for a persistent property or field. If no Column annotation is
- * specified, the default values are applied.
- *
- * @author Emmanuel Bernard
- */
-@Target({METHOD, FIELD}) @Retention(RUNTIME)
-public @interface Column {
- /**
- * The name of the column. Defaults to the property or field name
- */
- String name() default "";
- /**
- * Whether the property is a unique key. This is a shortcut for the UniqueConstraint
- * annotation at the table level and is useful for when the unique key constraint is
- * only a single field. This constraint applies in addition to any constraint entailed
- * by primary key mapping and to constraints specified at the table level.
- */
- boolean unique() default false;
- /**
- * Whether the database column is nullable
- */
- boolean nullable() default true;
- /**
- * Whether the column is included in SQL INSERT statements generated by the persistence provider.
- */
- boolean insertable() default true;
- /**
- * Whether the column is included in SQL UPDATE statements generated by the persistence provider.
- */
- boolean updatable() default true;
- /**
- * The SQL fragment that is used when generating the DDL for the column.
- * Defaults to the generated SQL to create a column of the inferred type.
- */
- String columnDefinition() default "";
- /**
- * The name of the table that contains the column. If absent the column is assumed to
- * be in the primary table.
- */
- String table() default "";
- /**
- * The column length. (Applies only if a string-valued column is used.)
- */
- int length() default 255;
- /**
- * The precision for a decimal (exact numeric) column. (Applies only if a decimal column is used.)
- * Value must be set by developer if used when generating the DDL for the column.
- */
- int precision() default 0;
- /**
- * The scale for a decimal (exact numeric) column. (Applies only if a decimal column is used.)
- */
- int scale() default 0;
-}
/trunk/src/javax/persistence/Column.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/SecondaryTable.java
===================================================================
--- trunk/src/javax/persistence/SecondaryTable.java (revision 38)
+++ trunk/src/javax/persistence/SecondaryTable.java (nonexistent)
@@ -1,53 +0,0 @@
-//$Id: SecondaryTable.java 11282 2007-03-14 22:05:59Z epbernard $
-//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
-package javax.persistence;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.ElementType.*;
-import static java.lang.annotation.RetentionPolicy.*;
-
-/**
- * This annotation is used to specify a secondary table for the annotated entity class. Specifying
- * one or more secondary tables indicates that the data for the entity class is stored across multiple
- * tables.
- *
- * If no SecondaryTable annotation is specified, it is assumed that all persistent fields or properties
- * of the entity are mapped to the primary table. If no primary key join columns are specified, the
- * join columns are assumed to reference the primary key columns of the primary table, and have the
- * same names and types as the referenced primary key columns of the primary table.
- *
- * @author Emmanuel Bernard
- */
-@Target({TYPE}) @Retention(RUNTIME)
-public @interface SecondaryTable {
- /**
- * The name of the table
- */
- String name();
- /**
- * The catalog of the table
- */
- String catalog() default "";
- /**
- * The schema of the table
- */
- String schema() default "";
- /**
- * The columns that are used to join with the primary table.
- *
- * Defaults to the column(s) of the same name(s) as the primary key column(s)
- * in the primary table
- */
- PrimaryKeyJoinColumn[] pkJoinColumns() default {};
- /**
- * Unique constraints that are to be placed on the table. These are typically only used if
- * table generation is in effect. These constraints apply in addition to any constraints
- * specified by the Column and JoinColumn annotations and constraints entailed by primary
- * key mappings.
- *
- * Defaults to no additional constraints.
- */
- UniqueConstraint[] uniqueConstraints() default {};
-}
/trunk/src/javax/persistence/SecondaryTable.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/JoinColumns.java
===================================================================
--- trunk/src/javax/persistence/JoinColumns.java (revision 38)
+++ trunk/src/javax/persistence/JoinColumns.java (nonexistent)
@@ -1,23 +0,0 @@
-//$Id: JoinColumns.java 11282 2007-03-14 22:05:59Z epbernard $
-//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
-package javax.persistence;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.ElementType.*;
-import static java.lang.annotation.RetentionPolicy.*;
-
-/**
- * Defines mapping for the composite foreign keys.
- * This annotation groups JoinColumn annotations for the same relationship.
- *
- * When the JoinColumns annotation is used, both the name and the referencedColumnName
- * elements must be specified in each such JoinColumn annotation.
-
- * @author Emmanuel Bernard
- */
-@Target({METHOD, FIELD}) @Retention(RUNTIME)
-public @interface JoinColumns {
- JoinColumn[] value();
-}
/trunk/src/javax/persistence/JoinColumns.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/PrePersist.java
===================================================================
--- trunk/src/javax/persistence/PrePersist.java (revision 38)
+++ trunk/src/javax/persistence/PrePersist.java (nonexistent)
@@ -1,25 +0,0 @@
-/* $Id: PrePersist.java 11282 2007-03-14 22:05:59Z epbernard $
- * JBoss Inc
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-package javax.persistence;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-
-/**
- * Is used to specify callback methods for the corresponding lifecycle event. This annotation may be applied
- * to methods of an entity class, a mapped superclass, or a callback listener class.
- *
- * @author <a href="mailto:bill@jboss.org">Bill Burke</a>
- */
-@Target({ElementType.METHOD})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface PrePersist {
-}
/trunk/src/javax/persistence/PrePersist.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/PersistenceException.java
===================================================================
--- trunk/src/javax/persistence/PersistenceException.java (revision 38)
+++ trunk/src/javax/persistence/PersistenceException.java (nonexistent)
@@ -1,50 +0,0 @@
-/* $Id: PersistenceException.java 11282 2007-03-14 22:05:59Z epbernard $
- * JBoss, Inc
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-package javax.persistence;
-
-/**
- * Thrown by the persistence provider when a problem occurs. All instances of PersistenceException
- * except for instances of NoResultException and NonUniqueResultException will cause the current
- * transaction, if one is active, to be marked for rollback.
- *
- * @author <a href="mailto:bill@jboss.org">Bill Burke</a>
- */
-public class PersistenceException extends RuntimeException {
- /**
- * Constructs a new PersistenceException exception with null as its detail message.
- */
- public PersistenceException() {
- }
-
- /**
- * Constructs a new PersistenceException exception with the specified detail message.
- *
- * @param message the detail message
- */
- public PersistenceException(String message) {
- super( message );
- }
-
- /**
- * Constructs a new PersistenceException exception with the specified detail message and cause
- *
- * @param message the detail message
- * @param cause the cause
- */
- public PersistenceException(String message, Throwable cause) {
- super( message, cause );
- }
-
- /**
- * Constructs a new PersistenceException exception with the specified cause
- *
- * @param cause the cause
- */
- public PersistenceException(Throwable cause) {
- super( cause );
- }
-}
/trunk/src/javax/persistence/PersistenceException.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/DiscriminatorValue.java
===================================================================
--- trunk/src/javax/persistence/DiscriminatorValue.java (revision 38)
+++ trunk/src/javax/persistence/DiscriminatorValue.java (nonexistent)
@@ -1,33 +0,0 @@
-//$Id: DiscriminatorValue.java 11282 2007-03-14 22:05:59Z epbernard $
-package javax.persistence;
-
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import static java.lang.annotation.ElementType.TYPE;
-
-/**
- * Is used to specify the value of the discriminator column for entities of the given type.
- * The DiscriminatorValue annotation can only be specified on a concrete entity class.
- * If the DiscriminatorValue annotation is not specified and a discriminator column is used,
- * a provider-specific function will be used to generate a value representing the entity type.
- * If the DiscriminatorType is STRING, the discriminator value default is the entity name.
- *
- * The inheritance strategy and the discriminator column are only specified in the root
- * of an entity class hierarchy or subhierarchy in which a different inheritance strategy
- * is applied. The discriminator value, if not defaulted, should be specified for each entity
- * class in the hierarchy.
- *
- * @author Emmanuel Bernard
- */
-@Target({TYPE}) @Retention(RUNTIME)
-public @interface DiscriminatorValue {
- /**
- * The value that indicates that the row is an entity of the annotated entity type.
- *
- * If the DiscriminatorValue annotation is not specified and a discriminator column is used,
- * a provider-specific function will be used to generate a value representing the entity type.
- * If the DiscriminatorType is STRING, the discriminator value default is the entity name.
- */
- String value();
-}
/trunk/src/javax/persistence/DiscriminatorValue.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/Embeddable.java
===================================================================
--- trunk/src/javax/persistence/Embeddable.java (revision 38)
+++ trunk/src/javax/persistence/Embeddable.java (nonexistent)
@@ -1,22 +0,0 @@
-//$Id: Embeddable.java 11282 2007-03-14 22:05:59Z epbernard $
-//EJB Specification Copyright 2004 Sun Microsystems, Inc.
-package javax.persistence;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.ElementType.*;
-import static java.lang.annotation.RetentionPolicy.*;
-
-
-/**
- * Defines a class whose instances are stored as an intrinsic part of an owning entity and share
- * the identity of the entity. Each of the persistent properties or fields of the embedded object
- * is mapped to the database table for the entity. Only Basic, Column, Lob, Temporal, and
- * Enumerated mapping annotations may portably be used to map the persistent fields or properties
- * of classes annotated as Embeddable.
- *
- * @author Emmanuel Bernard
- */
-@Target({TYPE}) @Retention(RUNTIME)
-public @interface Embeddable {}
/trunk/src/javax/persistence/Embeddable.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/Query.java
===================================================================
--- trunk/src/javax/persistence/Query.java (revision 38)
+++ trunk/src/javax/persistence/Query.java (nonexistent)
@@ -1,148 +0,0 @@
-// $Id: Query.java 11282 2007-03-14 22:05:59Z epbernard $
-package javax.persistence;
-
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-
-
-/**
- * Interface used to control query execution.
- */
-public interface Query
-{
- /**
- * Execute the query and return the query results as a List.
- *
- * @return a list of the results
- * @throws IllegalStateException f called for a Java Persistence query language UPDATE or DELETE statement
- */
- public List getResultList();
-
- /**
- * Execute a SELECT query that returns a single result.
- *
- * @return the result
- * @throws NoResultException if there is no result
- * @throws NonUniqueResultException if more than one result
- * @throws IllegalStateException if called for a Java
- * Persistence query language UPDATE or DELETE statement
- */
- public Object getSingleResult();
-
- /**
- * Execute an update or delete statement.
- *
- * @return the number of entities updated or deleted
- * @throws IllegalStateException if called for a Java Persistence query language SELECT statement
- * @throws TransactionRequiredException if there is no transaction
- */
- public int executeUpdate();
-
- /**
- * Set the maximum number of results to retrieve.
- *
- * @param maxResult
- * @return the same query instance
- * @throws IllegalArgumentException if argument is negative
- */
- public Query setMaxResults(int maxResult);
-
- /**
- * Set the position of the first result to retrieve.
- *
- * @param startPosition position of the first result, numbered from 0
- * @return the same query instance
- * @throws IllegalArgumentException if argument is negative
- */
- public Query setFirstResult(int startPosition);
-
- /**
- * Set an implementation-specific hint. If the hint name is not recognized, it is silently
- * ignored.
- *
- * @param hintName
- * @param value
- * @return the same query instance
- * @throws IllegalArgumentException if the second argument is not valid for the implementation
- */
- public Query setHint(String hintName, Object value);
-
- /**
- * Bind an argument to a named parameter.
- *
- * @param name the parameter name
- * @param value
- * @return the same query instance
- * @throws IllegalArgumentException if parameter name does not correspond to parameter in query
- * string or argument is of incorrect type
- */
- public Query setParameter(String name, Object value);
-
- /**
- * Bind an instance of java.util.Date to a named parameter.
- *
- * @param name
- * @param value
- * @param temporalType
- * @return the same query instance
- * @throws IllegalArgumentException if parameter name does not correspond to parameter in query
- * string
- */
- public Query setParameter(String name, Date value, TemporalType temporalType);
-
- /**
- * Bind an instance of java.util.Calendar to a named parameter.
- *
- * @param name
- * @param value
- * @param temporalType
- * @return the same query instance
- * @throws IllegalArgumentException if parameter name does not correspond to parameter in query
- * string
- */
- public Query setParameter(String name, Calendar value, TemporalType temporalType);
-
- /**
- * Bind an argument to a positional parameter.
- *
- * @param position
- * @param value
- * @return the same query instance
- * @throws IllegalArgumentException if position does not correspond to positional parameter of
- * query or argument is of incorrect type
- */
- public Query setParameter(int position, Object value);
-
- /**
- * Bind an instance of java.util.Date to a positional parameter.
- *
- * @param position
- * @param value
- * @param temporalType
- * @return the same query instance
- * @throws IllegalArgumentException if position does not correspond to positional parameter of
- * query
- */
- public Query setParameter(int position, Date value, TemporalType temporalType);
-
- /**
- * Bind an instance of java.util.Calendar to a positional parameter.
- *
- * @param position
- * @param value
- * @param temporalType
- * @return the same query instance } correspond to positional parameter of query
- */
- public Query setParameter(int position, Calendar value, TemporalType temporalType);
-
- /**
- * Set the flush mode type to be used for the query execution.
- * The flush mode type applies to the query regardless of the
- * flush mode type in use for the entity manager.
- *
- * @param flushMode
- */
- public Query setFlushMode(FlushModeType flushMode);
-
-}
\ No newline at end of file
/trunk/src/javax/persistence/Query.java
Property changes:
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/OrderBy.java
===================================================================
--- trunk/src/javax/persistence/OrderBy.java (revision 38)
+++ trunk/src/javax/persistence/OrderBy.java (nonexistent)
@@ -1,39 +0,0 @@
-//$Id: OrderBy.java 11282 2007-03-14 22:05:59Z epbernard $
-//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
-package javax.persistence;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-import static java.lang.annotation.ElementType.*;
-import static java.lang.annotation.RetentionPolicy.*;
-
-/**
- * This annotation specifies the ordering of the elements of a collection valued association at the
- * point when the association is retrieved.
- *
- * The syntax of the value ordering element is an orderby_list, as follows:
- * <code>orderby_list::= orderby_item [,orderby_item]*
- * orderby_item::= property_or_field_name [ASC | DESC]</code>
- *
- * If ASC or DESC is not specified, ASC (ascending order) is assumed.
- *
- * If the ordering element is not specified, ordering by the primary key of the associated
- * entity is assumed.
- *
- * The property or field name must correspond to that of a persistent property or field of the
- * associated class. The properties or fields used in the ordering must correspond to columns
- * for which comparison operators are supported.
- *
- * @author Emmanuel Bernard
- */
-@Target({METHOD, FIELD}) @Retention(RUNTIME)
-public @interface OrderBy {
- /**
- * An orderby_list, specified as follows:
- * orderby_list::= orderby_item [,orderby_item]* orderby_item::= property_or_field_name [ASC | DESC]
- *
- * If ASC or DESC is not specified, ASC (ascending order) is assumed.
- *
- */
- String value() default "";
-}
/trunk/src/javax/persistence/OrderBy.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/EntityNotFoundException.java
===================================================================
--- trunk/src/javax/persistence/EntityNotFoundException.java (revision 38)
+++ trunk/src/javax/persistence/EntityNotFoundException.java (nonexistent)
@@ -1,29 +0,0 @@
-//$Id: EntityNotFoundException.java 11282 2007-03-14 22:05:59Z epbernard $
-package javax.persistence;
-
-/**
- * Thrown by the persistence provider when an entity reference obtained by
- * EntityManager.getReference(Class,Object) is accessed but the entity does not exist.
- * Also thrown when EntityManager.refresh(Object) is called and the object no longer exists
- * in the database. The current transaction, if one is active, will be marked for rollback.
- *
- * @author Gavin King
- */
-public class EntityNotFoundException extends PersistenceException {
- /**
- * Constructs a new EntityNotFoundException exception with null as its detail message.
- */
- public EntityNotFoundException() {
- super();
- }
-
- /**
- * Constructs a new EntityNotFoundException exception with the specified detail message.
- *
- * @param message the detail message
- */
- public EntityNotFoundException(String message) {
- super( message );
- }
-
-}
/trunk/src/javax/persistence/EntityNotFoundException.java
Property changes:
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/UniqueConstraint.java
===================================================================
--- trunk/src/javax/persistence/UniqueConstraint.java (revision 38)
+++ trunk/src/javax/persistence/UniqueConstraint.java (nonexistent)
@@ -1,21 +0,0 @@
-//$Id: UniqueConstraint.java 11282 2007-03-14 22:05:59Z epbernard $
-//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
-package javax.persistence;
-
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-/**
- * This annotation is used to specify that a unique constraint is to be included in the generated DDL
- * for a primary or secondary table
- *
- * @author Emmanuel Bernard
- */
-@Target({}) @Retention(RUNTIME)
-public @interface UniqueConstraint {
- /**
- * An array of the column names that make up the constraint
- */
- String[] columnNames();
-}
/trunk/src/javax/persistence/UniqueConstraint.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/MappedSuperclass.java
===================================================================
--- trunk/src/javax/persistence/MappedSuperclass.java (revision 38)
+++ trunk/src/javax/persistence/MappedSuperclass.java (nonexistent)
@@ -1,25 +0,0 @@
-//$Id: MappedSuperclass.java 11282 2007-03-14 22:05:59Z epbernard $
-//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
-package javax.persistence;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.ElementType.*;
-import static java.lang.annotation.RetentionPolicy.*;
-
-/**
- * Designates a class whose mapping information is applied to the entities that inherit
- * from it. A mapped superclass has no separate table defined for it.
- *
- * A class designated with the MappedSuperclass annotation can be mapped in the same way as
- * an entity except that the mappings will apply only to its subclasses since no table exists
- * for the mapped superclass itself. When applied to the subclasses the inherited mappings will
- * apply in the context of the subclass tables. Mapping information may be overridden in such
- * subclasses by using the AttributeOverride and AssociationOverride annotations or corresponding *
- * XML elements.
- *
- * @author Emmanuel Bernard
- */
-@Target(TYPE) @Retention(RUNTIME)
-public @interface MappedSuperclass {}
/trunk/src/javax/persistence/MappedSuperclass.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/Entity.java
===================================================================
--- trunk/src/javax/persistence/Entity.java (revision 38)
+++ trunk/src/javax/persistence/Entity.java (nonexistent)
@@ -1,23 +0,0 @@
-//$Id: Entity.java 11282 2007-03-14 22:05:59Z epbernard $
-//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
-package javax.persistence;
-
-import static java.lang.annotation.ElementType.TYPE;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-/**
- * Specifies that the class is an entity. This annotation is applied to the entity class.
- *
- * @author Emmanuel Bernard
- */
-@Target(TYPE) @Retention(RUNTIME)
-public @interface Entity {
- /**
- * The name of an entity. Defaults to the unqualified name of the entity class.
- * This name is used to refer to the entity in queries. The name must not be a
- * reserved literal in the Java Persistence query language.
- */
- String name() default "";
-}
/trunk/src/javax/persistence/Entity.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/PrimaryKeyJoinColumns.java
===================================================================
--- trunk/src/javax/persistence/PrimaryKeyJoinColumns.java (revision 38)
+++ trunk/src/javax/persistence/PrimaryKeyJoinColumns.java (nonexistent)
@@ -1,22 +0,0 @@
-//$Id: PrimaryKeyJoinColumns.java 11282 2007-03-14 22:05:59Z epbernard $
-//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
-package javax.persistence;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.ElementType.*;
-import static java.lang.annotation.RetentionPolicy.*;
-
-/**
- * This annotation groups PrimaryKeyJoinColumn annotations. It is used to map composite foreign keys.
- *
- * @author Emmanuel Bernard
- */
-@Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME)
-public @interface PrimaryKeyJoinColumns {
- /**
- * One or more PrimaryKeyJoinColumn annotations
- */
- PrimaryKeyJoinColumn[] value();
-}
/trunk/src/javax/persistence/PrimaryKeyJoinColumns.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/SecondaryTables.java
===================================================================
--- trunk/src/javax/persistence/SecondaryTables.java (revision 38)
+++ trunk/src/javax/persistence/SecondaryTables.java (nonexistent)
@@ -1,21 +0,0 @@
-//$Id: SecondaryTables.java 11282 2007-03-14 22:05:59Z epbernard $
-//EJB3 Specification Copyright 2004-2006 Sun Microsystems, Inc.
-package javax.persistence;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.ElementType.*;
-import static java.lang.annotation.RetentionPolicy.*;
-/**
- * This annotation is used to specify multiple secondary tables for an entity.
- *
- * @author Emmanuel Bernard
- */
-@Target({TYPE}) @Retention(RUNTIME)
-public @interface SecondaryTables {
- /**
- * The secondary tables for an entity.
- */
- SecondaryTable[] value();
-}
/trunk/src/javax/persistence/SecondaryTables.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/javax/persistence/Persistence.java
===================================================================
--- trunk/src/javax/persistence/Persistence.java (revision 38)
+++ trunk/src/javax/persistence/Persistence.java (nonexistent)
@@ -1,111 +0,0 @@
-// $Id: Persistence.java 14134 2007-10-25 22:34:46Z epbernard $
-package javax.persistence;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import javax.persistence.spi.PersistenceProvider;
-
-/**
- * Bootstrap class that provides access to an EntityManagerFactory.
- */
-public class Persistence {
-
- //typo intended because it leaked into the JPA 1 spec. Do not use this constant.
- public static final java.lang.String PERSISTENCE_PROVIDER = "javax.persistence.spi.PeristenceProvider";
-
- protected static final Set<PersistenceProvider> providers = new HashSet<PersistenceProvider>();
-
- /**
- * Create and return an EntityManagerFactory for the named persistence unit.
- *
- * @param persistenceUnitName The name of the persistence unit
- * @return The factory that creates EntityManagers configured according to the specified persistence unit
- */
- public static EntityManagerFactory createEntityManagerFactory(String persistenceUnitName) {
- return createEntityManagerFactory( persistenceUnitName, null );
- }
-
- /**
- * Create and return an EntityManagerFactory for the named persistence unit using the given properties.
- *
- * @param persistenceUnitName The name of the persistence unit
- * @param properties Additional properties to use when creating the factory. The values of these properties override
- * any values that may have been configured elsewhere
- * @return The factory that creates EntityManagers configured according to the specified persistence unit
- */
- public static EntityManagerFactory createEntityManagerFactory(String persistenceUnitName, Map properties) {
- EntityManagerFactory emf = null;
-
- if ( providers.size() == 0 ) {
- findAllProviders();
- }
- for ( PersistenceProvider provider : providers ) {
- emf = provider.createEntityManagerFactory( persistenceUnitName, properties );
- if ( emf != null ) break;
- }
- if ( emf == null ) {
- throw new PersistenceException( "No Persistence provider for EntityManager named " + persistenceUnitName );
- }
- return emf;
- }
-
- // Helper methods
-
- private static void findAllProviders() {
- try {
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
- Enumeration<URL> resources = loader.getResources( "META-INF/services/" + PersistenceProvider.class.getName() );
- Set<String> names = new HashSet<String>();
- while ( resources.hasMoreElements() ) {
- URL url = resources.nextElement();
- InputStream is = url.openStream();
- try {
- names.addAll( providerNamesFromReader( new BufferedReader( new InputStreamReader( is ) ) ) );
- }
- finally {
- is.close();
- }
- }
- for ( String s : names ) {
- Class providerClass = loader.loadClass( s );
- providers.add( (PersistenceProvider) providerClass.newInstance() );
- }
- }
- catch (IOException e) {
- throw new PersistenceException( e );
- }
- catch (InstantiationException e) {
- throw new PersistenceException( e );
- }
- catch (IllegalAccessException e) {
- throw new PersistenceException( e );
- }
- catch (ClassNotFoundException e) {
- throw new PersistenceException( e );
- }
- }
-
- private static final Pattern nonCommentPattern = Pattern.compile( "^([^#]+)" );
-
- private static Set<String> providerNamesFromReader(BufferedReader reader) throws IOException {
- Set<String> names = new HashSet<String>();
- String line;
- while ( ( line = reader.readLine() ) != null ) {
- line = line.trim();
- Matcher m = nonCommentPattern.matcher( line );
- if ( m.find() ) {
- names.add( m.group().trim() );
- }
- }
- return names;
- }
-}
/trunk/src/javax/persistence/Persistence.java
Property changes:
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/log4j.properties
===================================================================
--- trunk/src/log4j.properties (revision 38)
+++ trunk/src/log4j.properties (nonexistent)
@@ -1,6 +0,0 @@
-### direct log messages to stdout ###
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.Target=System.out
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
-log4j.rootLogger=info, stdout
\ No newline at end of file
/trunk/src/log4j.properties
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/ch/ffhs/webE/action/UserAction.java
===================================================================
--- trunk/src/ch/ffhs/webE/action/UserAction.java (revision 38)
+++ trunk/src/ch/ffhs/webE/action/UserAction.java (nonexistent)
@@ -1,150 +0,0 @@
-package ch.ffhs.webE.action;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.struts2.StrutsStatics;
-
-import ch.ffhs.webE.dao.UserDAO;
-import ch.ffhs.webE.domain.User;
-
-import com.opensymphony.xwork2.Action;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionSupport;
-import com.opensymphony.xwork2.ModelDriven;
-
-public class UserAction extends ActionSupport implements ModelDriven<User>
-{
-
- private static final long serialVersionUID = 1L;
-
- private User user = new User();
- private List<User> userList = new ArrayList<User>();
- private final UserDAO userDAO = new UserDAO();
-
- public boolean edit = false;
- public boolean added = false;
- public User savedUser;
-
- @Override
- public User getModel()
- {
- return this.user;
- }
-
- /**
- * DB query for userList
- *
- * @return SUCCESS
- */
- public String list()
- {
- this.userList = this.userDAO.getList();
- return Action.SUCCESS;
- }
-
- /**
- * Executes the DB query to save the user
- *
- * @return
- */
- public String save()
- {
- this.userDAO.saveOrUpdate(this.user);
- this.savedUser = this.user;
- this.user = null;
-
- this.list();
-
- return Action.SUCCESS;
- }
-
- public String edit()
- {
- int id = this.getIdParameter();
-
- String result = Action.ERROR;
- if (id > 0)
- {
- this.user = this.userDAO.getById(id);
- this.edit = true;
- result = Action.SUCCESS;
- }
-
- this.list();
-
- return result;
- }
-
- /**
- * Gets the ID Parameter for update / delete requests
- *
- * @return int from the ID request. If not set or wrong, it gives back -1
- */
- private int getIdParameter()
- {
- HttpServletRequest request = (HttpServletRequest) ActionContext
- .getContext().get(StrutsStatics.HTTP_REQUEST);
-
- int id = -1;
- try
- {
- id = Integer.parseInt(request.getParameter("id"));
- }
- catch (Exception e)
- {
- // TODO: Logging - wrong parameter set
- }
-
- return id;
- }
-
- /**
- * deletes a user, gets the ID from the "id" parameter that was submitted with
- * the HTTP request
- *
- * @return String - either SUCCESS or ERROR constant
- */
- public String delete()
- {
-
- int id = this.getIdParameter();
-
- // Check for malicious ID values
- if (id > 0)
- {
- this.userDAO.delete(id);
- return Action.SUCCESS;
- }
- else
- {
- return Action.ERROR;
- }
- }
-
- /*
- * Standard getters and setters
- */
-
- public User getUser()
- {
- return this.user;
- }
-
- public void setUser(User user)
- {
- this.user = user;
- }
-
- public List<User> getUserList()
- {
- return this.userList;
- }
-
- public void setUserList(List<User> userList)
- {
- this.userList = userList;
- }
-}
/trunk/src/ch/ffhs/webE/action/UserAction.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/ch/ffhs/webE/action/RelationshipAction.java
===================================================================
--- trunk/src/ch/ffhs/webE/action/RelationshipAction.java (revision 38)
+++ trunk/src/ch/ffhs/webE/action/RelationshipAction.java (nonexistent)
@@ -1,342 +0,0 @@
-package ch.ffhs.webE.action;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.struts2.StrutsStatics;
-
-import ch.ffhs.webE.dao.HistoryDAO;
-import ch.ffhs.webE.dao.RelationshipDAO;
-import ch.ffhs.webE.dao.RelationshipTypeDAO;
-import ch.ffhs.webE.dao.TermDAO;
-import ch.ffhs.webE.dao.UserDAO;
-import ch.ffhs.webE.domain.ActionType;
-import ch.ffhs.webE.domain.History;
-import ch.ffhs.webE.domain.ObjectEntity;
-import ch.ffhs.webE.domain.ObjectType;
-import ch.ffhs.webE.domain.Relationship;
-import ch.ffhs.webE.domain.RelationshipType;
-import ch.ffhs.webE.domain.Term;
-import ch.ffhs.webE.domain.User;
-
-import com.opensymphony.xwork2.Action;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionSupport;
-import com.opensymphony.xwork2.ModelDriven;
-
-/**
- * Implements actions applicable to relationship editing
- *
- * @author Thomas Lahn
- */
-public class RelationshipAction extends ActionSupport implements
- ModelDriven<Relationship>
-{
- private static final long serialVersionUID = 1L;
-
- private List<RelationshipType> relationshipTypes = new ArrayList<RelationshipType>();
- private final RelationshipTypeDAO relationshipTypeDAO = new RelationshipTypeDAO();
-
- private List<Term> terms = new ArrayList<Term>();
- private final TermDAO termDAO = new TermDAO();
-
- private List<Relationship> relationshipList = new ArrayList<Relationship>();
- private Relationship relationship = new Relationship();
-
- /**
- * The term that was just saved (added, renamed)
- */
- private Relationship modifiedRelationship;
-
- private final RelationshipDAO relationshipDAO = new RelationshipDAO();
-
- private final UserDAO userDAO = new UserDAO();
-
- private Set<History> history;
- private final HistoryDAO historyDAO = new HistoryDAO();
-
- /**
- * Session object
- */
- Map<String, Object> session = ActionContext.getContext().getSession();
-
- /**
- * @var <code>true</code> if the relationship is to be edited/renamed,
- * <code>false</code> otherwise
- */
- public boolean edit = false;
-
- /**
- * @var <code>true</code> if a relationship was added, <code>false</code>
- * otherwise
- */
- public boolean added = false;
-
- private final HttpServletRequest request = (HttpServletRequest) ActionContext
- .getContext().get(StrutsStatics.HTTP_REQUEST);
-
- /*
- * (non-Javadoc)
- *
- * @see com.opensymphony.xwork2.ModelDriven#getModel()
- */
- public Relationship getModel()
- {
- return this.relationship;
- }
-
- /**
- * DB query for relationship list
- *
- * @return SUCCESS
- */
- public String list()
- {
- this.setTerms(this.termDAO.getList());
- this.setRelationshipTypes(this.relationshipTypeDAO.getList());
- this.setRelationshipList(this.relationshipDAO.getList());
- return Action.SUCCESS;
- }
-
- /**
- * Executes the DB query to save the relationship
- *
- * @return {@link Action#SUCCESS}
- */
- public String save()
- {
- this.relationship.setTermFrom(this.termDAO.getById(Integer
- .parseInt(this.request.getParameter("term1"))));
- this.relationship.setTermTo(this.termDAO.getById(Integer
- .parseInt(this.request.getParameter("term2"))));
- this.relationship.setRelationshipType(this.relationshipTypeDAO
- .getById(Integer.parseInt(this.request.getParameter("type"))));
-
- User user = this.userDAO.getByUsername((String) this.session
- .get("username"));
- Date now = new Date();
- ObjectEntity obj;
- int action = 0;
-
- if ("false".equals(this.request.getParameter("edit")))
- {
- /* Add a new relationship */
- obj = new ObjectEntity(user, new ObjectType(ObjectType.RELATIONSHIP),
- user, null, new Date(), false, null, null, this.relationship);
- this.relationship.setObject(obj);
- this.added = true;
- action = ActionType.ADD;
- }
- else
- {
- obj = new ObjectEntity();
- obj.setId(this.relationship.getObjectId());
- action = ActionType.MODIFY;
- }
-
- this.edit = false;
-
- String result = Action.SUCCESS;
- if (this.relationshipDAO.saveOrUpdate(this.relationship))
- {
- String comment = this.request.getParameter("comment");
-
- History historyRecord = new History(user, new ActionType(action), obj,
- "(" + this.relationship.getTermFrom().getName() + ") ("
- + this.relationship.getRelationshipType().getNameFrom() + ") ("
- + this.relationship.getTermTo().getName() + ")", comment, now);
-
- this.historyDAO.saveOrUpdate(historyRecord);
- }
- else
- {
- result = Action.ERROR;
- }
-
- this.setModifiedRelationship(this.relationship);
- this.setRelationship(null);
-
- this.list();
-
- return result;
- }
-
- /**
- * @return {@link Action#SUCCESS} if <var>id</var> > 0, {@link Action#ERROR}
- * otherwise
- */
- public String edit()
- {
- int id = this.getIdParameter();
-
- String result = Action.ERROR;
- if (id > 0)
- {
- this.setRelationship(this.relationshipDAO.getById(id));
- if (this.getRelationship() != null)
- {
- this.edit = true;
- result = Action.SUCCESS;
- }
- }
-
- this.list();
-
- return result;
- }
-
- /**
- * deletes a user, gets the ID from the "id" parameter that was submitted with
- * the HTTP request
- *
- * @return String - either SUCCESS or ERROR constant
- */
- public String delete()
- {
- int id = this.getIdParameter();
-
- /* Check for malicious ID values */
- String result = Action.SUCCESS;
- if (id > 0)
- {
- this.relationshipDAO.delete(id);
- }
- else
- {
- result = Action.ERROR;
- }
-
- this.list();
-
- return result;
- }
-
- /**
- * Gets the ID Parameter for update / delete requests
- *
- * @return int from the ID request. If not set or wrong, it gives back -1
- */
- private int getIdParameter()
- {
- int id = -1;
- try
- {
- id = Integer.parseInt(this.request.getParameter("id")); //$NON-NLS-1$
- }
- catch (Exception e)
- {
- /* TODO: Logging - wrong parameter set */
- }
-
- return id;
- }
-
- /* Standard getters and setters */
-
- /**
- * @return The relationship edited with this instance
- */
- public Relationship getRelationship()
- {
- return this.relationship;
- }
-
- /**
- * @param relationship
- * The relationship edited with this instance
- */
- public void setRelationship(Relationship relationship)
- {
- this.relationship = relationship;
- }
-
- /**
- * @return The list of terms edited with this instance
- */
- public List<Relationship> getRelationshipList()
- {
- return this.relationshipList;
- }
-
- /**
- * @param relationshipList
- * The list of terms edited with this instance
- */
- public void setRelationshipList(List<Relationship> relationshipList)
- {
- this.relationshipList = relationshipList;
- }
-
- /**
- * @return the relationshipTypes
- */
- public List<RelationshipType> getRelationshipTypes()
- {
- return this.relationshipTypes;
- }
-
- /**
- * @param relationshipTypes
- * the relationshipTypes to set
- */
- public void setRelationshipTypes(List<RelationshipType> relationshipTypes)
- {
- this.relationshipTypes = relationshipTypes;
- }
-
- /**
- * @return the terms
- */
- public List<Term> getTerms()
- {
- return this.terms;
- }
-
- /**
- * @param terms
- * the terms to set
- */
- public void setTerms(List<Term> terms)
- {
- this.terms = terms;
- }
-
- /**
- * @return the modifiedRelationship
- */
- public Relationship getModifiedRelationship()
- {
- return this.modifiedRelationship;
- }
-
- /**
- * @param modifiedRelationship
- * the modifiedRelationship to set
- */
- public void setModifiedRelationship(Relationship modifiedRelationship)
- {
- this.modifiedRelationship = modifiedRelationship;
- }
-
- /**
- * @return the history
- */
- public Set<History> getHistory()
- {
- return this.history;
- }
-
- /**
- * @param history
- * the history to set
- */
- public void setHistory(Set<History> history)
- {
- this.history = history;
- }
-}
/trunk/src/ch/ffhs/webE/action/RelationshipAction.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/ch/ffhs/webE/action/RelationshipTypeAction.java
===================================================================
--- trunk/src/ch/ffhs/webE/action/RelationshipTypeAction.java (revision 38)
+++ trunk/src/ch/ffhs/webE/action/RelationshipTypeAction.java (nonexistent)
@@ -1,135 +0,0 @@
-package ch.ffhs.webE.action;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.struts2.StrutsStatics;
-
-import ch.ffhs.webE.dao.RelationshipTypeDAO;
-import ch.ffhs.webE.domain.RelationshipType;
-
-import com.opensymphony.xwork2.Action;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionSupport;
-import com.opensymphony.xwork2.ModelDriven;
-
-public class RelationshipTypeAction extends ActionSupport implements
- ModelDriven<RelationshipType>
-{
-
- private static final long serialVersionUID = -3644691864156792139L;
-
- private RelationshipType relType = new RelationshipType();
- private List<RelationshipType> relTypeList = new ArrayList<RelationshipType>();
- private final RelationshipTypeDAO relTypeDAO = new RelationshipTypeDAO();
-
- public boolean edit = false;
- public boolean added = false;
- public RelationshipType savedRelType;
-
- @Override
- public RelationshipType getModel()
- {
- return this.relType;
- }
-
- public String addOrUpdate()
- {
- this.relTypeDAO.saveOrUpdate(this.relType);
- return Action.SUCCESS;
- }
-
- public String list()
- {
- this.relTypeList = this.relTypeDAO.getList();
- return Action.SUCCESS;
- }
-
- public String edit()
- {
- int id = this.getIdParameter();
-
- String result = Action.ERROR;
- if (id > 0)
- {
- this.relType = this.relTypeDAO.getById(id);
- this.edit = true;
- result = Action.SUCCESS;
- }
-
- this.list();
-
- return result;
- }
-
- /**
- * Gets the ID Parameter for update / delete requests
- *
- * @return int from the ID request. If not set or wrong, it gives back -1
- */
- private int getIdParameter()
- {
- HttpServletRequest request = (HttpServletRequest) ActionContext
- .getContext().get(StrutsStatics.HTTP_REQUEST);
-
- int id = -1;
- try
- {
- id = Integer.parseInt(request.getParameter("id"));
- }
- catch (Exception e)
- {
- // TODO: Logging - wrong parameter set
- }
-
- return id;
- }
-
- /**
- * deletes a relationshipType, gets the ID from the id parameter that was
- * submitted
- *
- * @return String - either success or error
- */
- public String delete()
- {
- int id = this.getIdParameter();
-
- // Check for malicious ID values
- if (id > 0)
- {
- this.relTypeDAO.delete(id);
- return Action.SUCCESS;
- }
- else
- {
- return Action.ERROR;
- }
- }
-
- /*
- * Getters and setters
- */
-
- public RelationshipType getRelType()
- {
- return this.relType;
- }
-
- public void setRelType(RelationshipType relType)
- {
- this.relType = relType;
- }
-
- public List<RelationshipType> getRelTypeList()
- {
- return this.relTypeList;
- }
-
- public void setRelTypeList(List<RelationshipType> relTypeList)
- {
- this.relTypeList = relTypeList;
- }
-}
\ No newline at end of file
/trunk/src/ch/ffhs/webE/action/RelationshipTypeAction.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/ch/ffhs/webE/action/TermAction.java
===================================================================
--- trunk/src/ch/ffhs/webE/action/TermAction.java (revision 38)
+++ trunk/src/ch/ffhs/webE/action/TermAction.java (nonexistent)
@@ -1,267 +0,0 @@
-package ch.ffhs.webE.action;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.struts2.StrutsStatics;
-
-import ch.ffhs.webE.dao.HistoryDAO;
-import ch.ffhs.webE.dao.TermDAO;
-import ch.ffhs.webE.dao.UserDAO;
-import ch.ffhs.webE.domain.ActionType;
-import ch.ffhs.webE.domain.History;
-import ch.ffhs.webE.domain.ObjectEntity;
-import ch.ffhs.webE.domain.ObjectType;
-import ch.ffhs.webE.domain.Term;
-import ch.ffhs.webE.domain.User;
-
-import com.opensymphony.xwork2.Action;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionSupport;
-import com.opensymphony.xwork2.ModelDriven;
-
-/**
- * Implements actions applicable to term editing
- *
- * @author Thomas Lahn
- */
-public class TermAction extends ActionSupport implements ModelDriven<Term>
-{
- private static final long serialVersionUID = 1L;
-
- private Term term = new Term();
- private List<Term> termList = new ArrayList<Term>();
- private final TermDAO termDAO = new TermDAO();
- private final UserDAO userDAO = new UserDAO();
-
- /**
- * Session object
- */
- Map<String, Object> session = ActionContext.getContext().getSession();
-
- /**
- * @var <code>true</code> if the term is edited/renamed, <code>false</code>
- * otherwise
- */
- public boolean edit = false;
-
- /**
- * @var <code>true</code> if a term was added, <code>false</code> otherwise
- */
- public boolean added = false;
-
- private final HttpServletRequest request = (HttpServletRequest) ActionContext
- .getContext().get(StrutsStatics.HTTP_REQUEST);
-
- /**
- * The term that was just saved (added, renamed)
- */
- public Term savedTerm;
-
- private final HistoryDAO historyDAO = new HistoryDAO();
-
- private Set<History> history;
-
- /*
- * (non-Javadoc)
- *
- * @see com.opensymphony.xwork2.ModelDriven#getModel()
- */
- public Term getModel()
- {
- return this.term;
- }
-
- /**
- * DB query for term list
- *
- * @return SUCCESS
- */
- public String list()
- {
- this.termList = this.termDAO.getList();
- return Action.SUCCESS;
- }
-
- /**
- * Executes the DB query to save the user
- *
- * @return {@link Action#SUCCESS}
- */
- public String save()
- {
- User user = this.userDAO.getByUsername((String) this.session
- .get("username"));
- Date now = new Date();
- ObjectEntity obj;
-
- int action = 0;
- if ("false".equals(this.request.getParameter("edit")))
- {
- /* Add a new term */
- obj = new ObjectEntity(user, new ObjectType(ObjectType.TERM), user, null,
- now, false, this.term, null, null);
-
- this.term.setObject(obj);
- this.added = true;
- action = ActionType.ADD;
- }
- else
- {
- obj = new ObjectEntity();
- obj.setId(this.term.getObjectId());
- action = ActionType.RENAME;
- }
-
- String result = Action.SUCCESS;
- if (this.termDAO.saveOrUpdate(this.term))
- {
- String comment = this.request.getParameter("comment");
-
- History historyRecord = new History(user, new ActionType(action), obj,
- this.term.getName(), comment, now);
-
- this.historyDAO.saveOrUpdate(historyRecord);
- }
- else
- {
- result = Action.ERROR;
- }
-
- this.savedTerm = this.term;
- this.term = null;
-
- this.list();
-
- return result;
- }
-
- /**
- * @return {@link Action#SUCCESS} if <var>id</var> > 0, {@link Action#ERROR}
- * otherwise
- */
- public String edit()
- {
- int id = this.getIdParameter();
-
- String result = Action.ERROR;
- if (id > 0)
- {
- this.term = this.termDAO.getById(id);
- if (this.term != null)
- {
- this.edit = true;
- result = Action.SUCCESS;
- }
- }
-
- this.list();
-
- return result;
- }
-
- /**
- * deletes a term, gets the ID from the "id" parameter that was submitted with
- * the HTTP request
- *
- * @return String - either SUCCESS or ERROR constant
- */
- public String delete()
- {
-
- int id = this.getIdParameter();
-
- /* Check for malicious ID values */
- String result = Action.SUCCESS;
- if (id > 0)
- {
- this.termDAO.delete(id);
- }
- else
- {
- result = Action.ERROR;
- }
-
- this.list();
-
- return result;
- }
-
- /**
- * Gets the ID Parameter for update / delete requests
- *
- * @return int from the ID request. If not set or wrong, it gives back -1
- */
- private int getIdParameter()
- {
- int id = -1;
- try
- {
- id = Integer.parseInt(this.request.getParameter("id")); //$NON-NLS-1$
- }
- catch (Exception e)
- {
- /* TODO: Logging - wrong parameter set */
- }
-
- return id;
- }
-
- /* Standard getters and setters */
-
- /**
- * @return The term edited with this instance
- */
- public Term getTerm()
- {
- return this.term;
- }
-
- /**
- * @param term
- * The term edited with this instance
- */
- public void setTerm(Term term)
- {
- this.term = term;
- }
-
- /**
- * @return The list of terms edited with this instance
- */
- public List<Term> getTermList()
- {
- return this.termList;
- }
-
- /**
- * @param termList
- * The list of terms edited with this instance
- */
- public void setTermList(List<Term> termList)
- {
- this.termList = termList;
- }
-
- /**
- * @return the histories
- */
- public Set<History> getHistories()
- {
- return this.history;
- }
-
- /**
- * @param histories
- * the histories to set
- */
- public void setHistories(Set<History> histories)
- {
- this.history = histories;
- }
-}
/trunk/src/ch/ffhs/webE/action/TermAction.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/ch/ffhs/webE/action/LoginAction.java
===================================================================
--- trunk/src/ch/ffhs/webE/action/LoginAction.java (revision 38)
+++ trunk/src/ch/ffhs/webE/action/LoginAction.java (nonexistent)
@@ -1,137 +0,0 @@
-package ch.ffhs.webE.action;
-
-import java.util.Map;
-
-import ch.ffhs.webE.dao.UserDAO;
-import ch.ffhs.webE.domain.User;
-
-import com.opensymphony.xwork2.Action;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionSupport;
-import com.opensymphony.xwork2.ModelDriven;
-
-public class LoginAction extends ActionSupport implements ModelDriven<User>
-{
-
- private static final long serialVersionUID = 1799753056277211344L;
- private final User user = new User();
- private final UserDAO userDAO = new UserDAO();
-
- /* Form fields */
- private String userName;
- private String pw;
-
- /**
- * JSP session object
- */
- Map<String, Object> session = ActionContext.getContext().getSession();
-
- /**
- *
- */
- public LoginAction()
- {
- }
-
- public String doLogin()
- {
-
- // If password or user name are empty, the login fails.
- if ("".equals(this.getUserName()) || "".equals(this.getPw())
- || this.getUserName() == null || this.getPw() == null)
- {
- this.addFieldError("userName", "Falscher Username oder Passwort");
- return Action.ERROR;
- }
-
- String verifiedUser = this.verifyUser(this.getUserName(), this.getPw());
- if (verifiedUser.equals("failed"))
- {
- this.addFieldError("userName", "Falscher Username oder Passwort");
- return Action.ERROR;
- }
- else
- {
-
- // Put user name, password into session
- this.session.put("username", this.getUserName());
- this.session.put("pw", this.getPw());
- return verifiedUser;
- }
- }
-
- /**
- * Logout ausf�hren. Zerst�rt die Daten in der Session
- *
- * @return String
- */
- public String doLogout()
- {
- // Kill Session content
- ActionContext.getContext().getSession().clear();
- return Action.SUCCESS;
- }
-
- /**
- * Verify user credentials
- *
- * @param String
- * username: User name
- * @param String
- * password: Password (hashed)
- * @return
- */
- public String verifyUser(String username, String password)
- {
- // DB Query
- User u = this.userDAO.getByUsername(username);
-
- // User does not exist
- if (u == null)
- {
- return Action.ERROR;
- }
-
- // User password does not match
- if (!u.getPassword().equals(password))
- {
- return Action.ERROR;
- }
-
- // User credentials are fine, check for admin rights
- if (u.isAdmin())
- {
- return "admin";
- }
- else
- {
- return "user";
- }
- }
-
- public String getUserName()
- {
- return this.userName;
- }
-
- public void setUserName(String userName)
- {
- this.userName = userName;
- }
-
- public String getPw()
- {
- return this.pw;
- }
-
- public void setPw(String pw)
- {
- this.pw = pw;
- }
-
- @Override
- public User getModel()
- {
- return this.user;
- }
-}
/trunk/src/ch/ffhs/webE/action/LoginAction.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/ch/ffhs/webE/dao/TermDAO.java
===================================================================
--- trunk/src/ch/ffhs/webE/dao/TermDAO.java (revision 38)
+++ trunk/src/ch/ffhs/webE/dao/TermDAO.java (nonexistent)
@@ -1,128 +0,0 @@
-package ch.ffhs.webE.dao;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.hibernate.Session;
-import org.hibernate.Transaction;
-
-import ch.ffhs.webE.domain.Term;
-
-import com.googlecode.s2hibernate.struts2.plugin.annotations.SessionTarget;
-import com.googlecode.s2hibernate.struts2.plugin.annotations.TransactionTarget;
-
-/**
- * Implements the Database Access Object for terms
- *
- * @author Thomas Lahn
- */
-public class TermDAO
-{
- /**
- * Database session
- */
- @SessionTarget
- Session session;
-
- /**
- * Database transaction
- */
- @TransactionTarget
- Transaction transaction;
-
- /**
- * Returns a list of all terms
- *
- * @return an ArrayList with all the terms - in case of a problem, an empty
- * list is returned
- */
- @SuppressWarnings("unchecked")
- public List<Term> getList()
- {
- List<Term> term = null;
- try
- {
- term = this.session.createQuery("from Term").list(); //$NON-NLS-1$
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
-
- /*
- * If no term was checked, return an empty list to mitigate null pointer
- * exceptions
- */
- if (term == null)
- {
- term = new ArrayList<Term>();
- }
-
- return term;
- }
-
- /**
- * Executes the query to save the term
- *
- * @param term
- * Domain object to be saved
- * @return <code>true</code> if successful, <code>false</code> otherwise
- */
- public boolean saveOrUpdate(Term term)
- {
- try
- {
- term.setObjectId(term.getObjectId());
- this.session.saveOrUpdate(term);
- return true;
- }
- catch (Exception e)
- {
- this.transaction.rollback();
- e.printStackTrace();
- return false;
- }
- }
-
- /**
- * Delete a term
- *
- * @param termId
- * Term ID
- */
- public void delete(int termId)
- {
- try
- {
- Term term = (Term) this.session.get(Term.class, termId);
- this.session.delete(term);
- }
- catch (Exception e)
- {
- this.transaction.rollback();
- e.printStackTrace();
- }
- }
-
- /**
- * Retrieves a term by ID
- *
- * @param termId
- * @return
- */
- public Term getById(int termId)
- {
- Term term = null;
-
- try
- {
- term = (Term) this.session.get(Term.class, termId);
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
-
- return term;
- }
-}
\ No newline at end of file
/trunk/src/ch/ffhs/webE/dao/TermDAO.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/ch/ffhs/webE/dao/UserDAO.java
===================================================================
--- trunk/src/ch/ffhs/webE/dao/UserDAO.java (revision 38)
+++ trunk/src/ch/ffhs/webE/dao/UserDAO.java (nonexistent)
@@ -1,134 +0,0 @@
-package ch.ffhs.webE.dao;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.hibernate.Session;
-import org.hibernate.Transaction;
-
-import ch.ffhs.webE.domain.User;
-
-import com.googlecode.s2hibernate.struts2.plugin.annotations.SessionTarget;
-import com.googlecode.s2hibernate.struts2.plugin.annotations.TransactionTarget;
-
-public class UserDAO
-{
-
- @SessionTarget
- Session session;
- @TransactionTarget
- Transaction transaction;
-
- /**
- * Creates a list of all the registered users
- *
- * @return an ArrayList with all the users - in case of a problem, an empty
- * list is returned
- */
- @SuppressWarnings("unchecked")
- public List<User> getList()
- {
- List<User> user = null;
- try
- {
- user = this.session.createQuery("from User").list();
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
-
- // If no user was checked, return an empty list to mitigate null pointer
- // exceptions
- if (user == null)
- {
- user = new ArrayList<User>();
- }
- return user;
- }
-
- /**
- * Executes the query to save the user
- *
- * @param user
- * Domain object to be saved
- * @return void
- */
- public void saveOrUpdate(User user)
- {
- try
- {
- this.session.saveOrUpdate(user);
- }
- catch (Exception e)
- {
- this.transaction.rollback();
- e.printStackTrace();
- }
- }
-
- /**
- * Used to delete a user.
- *
- * @param userId
- */
- public void delete(int userId)
- {
- try
- {
- User user = (User) this.session.get(User.class, userId);
- this.session.delete(user);
- }
- catch (Exception e)
- {
- this.transaction.rollback();
- e.printStackTrace();
- }
- }
-
- /**
- * Returns a single user with this user name (used for login)
- *
- * @param username
- * : String - entire user name
- * @return User: Returns a user object if something is found. If not, null is
- * returned
- */
- public User getByUsername(String username)
- {
- User user = null;
-
- // Exec query
- try
- {
- user = (User) this.session
- .createQuery("FROM User " + "WHERE username = :username")
- .setParameter("username", username).uniqueResult();
- }
- catch (Exception e)
- {
- // TODO: Log error
- }
- return user;
- }
-
- /**
- * Used to list a single user by Id.
- *
- * @param userId
- * @return
- */
- public User getById(int userId)
- {
- User user = null;
- try
- {
- user = (User) this.session.get(User.class, userId);
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
- return user;
- }
-}
\ No newline at end of file
/trunk/src/ch/ffhs/webE/dao/UserDAO.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/ch/ffhs/webE/dao/RelationshipDAO.java
===================================================================
--- trunk/src/ch/ffhs/webE/dao/RelationshipDAO.java (revision 38)
+++ trunk/src/ch/ffhs/webE/dao/RelationshipDAO.java (nonexistent)
@@ -1,130 +0,0 @@
-package ch.ffhs.webE.dao;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.hibernate.Session;
-import org.hibernate.Transaction;
-
-import ch.ffhs.webE.domain.Relationship;
-
-import com.googlecode.s2hibernate.struts2.plugin.annotations.SessionTarget;
-import com.googlecode.s2hibernate.struts2.plugin.annotations.TransactionTarget;
-
-/**
- * Implements the Database Access Object for terms
- *
- * @author Thomas Lahn
- */
-public class RelationshipDAO
-{
- /**
- * Database session
- */
- @SessionTarget
- Session session;
-
- /**
- * Database transaction
- */
- @TransactionTarget
- Transaction transaction;
-
- /**
- * Creates a list of all relationships
- *
- * @return an ArrayList with all the relationshops - in case of a problem, an
- * empty list is returned
- */
- @SuppressWarnings("unchecked")
- public List<Relationship> getList()
- {
- List<Relationship> relationship = null;
- try
- {
- relationship = this.session.createQuery("from Relationship").list(); //$NON-NLS-1$
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
-
- /*
- * If no relationship was checked, return an empty list to mitigate null
- * pointer exceptions
- */
- if (relationship == null)
- {
- relationship = new ArrayList<Relationship>();
- }
-
- return relationship;
- }
-
- /**
- * Executes the query to save the relationship
- *
- * @param relationship
- * Domain object to be saved
- * @return <code>true</code> if successful, <code>false</code> otherwise
- */
- public boolean saveOrUpdate(Relationship relationship)
- {
- try
- {
- relationship.setObjectId(relationship.getObjectId());
- this.session.saveOrUpdate(relationship);
- return true;
- }
- catch (Exception e)
- {
- this.transaction.rollback();
- e.printStackTrace();
- return false;
- }
- }
-
- /**
- * Delete a relationship
- *
- * @param id
- * Relationship ID
- */
- public void delete(int id)
- {
- try
- {
- Relationship relationship = (Relationship) this.session.get(
- Relationship.class, id);
- this.session.delete(relationship);
- }
- catch (Exception e)
- {
- this.transaction.rollback();
- e.printStackTrace();
- }
- }
-
- /**
- * Retrieves a relationship by ID
- *
- * @param id
- * Term ID
- * @return The relationship with this <var>id</var>
- */
- public Relationship getById(int id)
- {
- Relationship relationship = null;
-
- try
- {
- relationship = (Relationship) this.session.get(Relationship.class, id);
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
-
- return relationship;
- }
-}
\ No newline at end of file
/trunk/src/ch/ffhs/webE/dao/RelationshipDAO.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/ch/ffhs/webE/dao/HistoryDAO.java
===================================================================
--- trunk/src/ch/ffhs/webE/dao/HistoryDAO.java (revision 38)
+++ trunk/src/ch/ffhs/webE/dao/HistoryDAO.java (nonexistent)
@@ -1,88 +0,0 @@
-/**
- *
- */
-package ch.ffhs.webE.dao;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.hibernate.Session;
-import org.hibernate.Transaction;
-
-import ch.ffhs.webE.domain.History;
-
-import com.googlecode.s2hibernate.struts2.plugin.annotations.SessionTarget;
-import com.googlecode.s2hibernate.struts2.plugin.annotations.TransactionTarget;
-
-/**
- * @author pelinux
- *
- */
-public class HistoryDAO
-{
- /**
- * Database session
- */
- @SessionTarget
- Session session;
-
- /**
- * Database transaction
- */
- @TransactionTarget
- Transaction transaction;
-
- /**
- * Executes the query to save the history record
- *
- * @param history
- * Domain object to be saved
- * @return <code>true</code> if successful, <code>false</code> otherwise
- */
- public boolean saveOrUpdate(History history)
- {
- try
- {
- history.setId(history.getId());
- this.session.saveOrUpdate(history);
- return true;
- }
- catch (Exception e)
- {
- this.transaction.rollback();
- e.printStackTrace();
- return false;
- }
- }
-
- /**
- * Returns a list of all terms
- *
- * @return an ArrayList with all the terms - in case of a problem, an empty
- * list is returned
- */
- @SuppressWarnings("unchecked")
- public List<History> getList()
- {
- List<History> history = null;
- try
- {
- history = this.session.createQuery("from History").list(); //$NON-NLS-1$
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
-
- /*
- * If no term was checked, return an empty list to mitigate null pointer
- * exceptions
- */
- if (history == null)
- {
- history = new ArrayList<History>();
- }
-
- return history;
- }
-}
/trunk/src/ch/ffhs/webE/dao/HistoryDAO.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/ch/ffhs/webE/dao/RelationshipTypeDAO.java
===================================================================
--- trunk/src/ch/ffhs/webE/dao/RelationshipTypeDAO.java (revision 38)
+++ trunk/src/ch/ffhs/webE/dao/RelationshipTypeDAO.java (nonexistent)
@@ -1,130 +0,0 @@
-package ch.ffhs.webE.dao;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.hibernate.Session;
-import org.hibernate.Transaction;
-
-import ch.ffhs.webE.domain.RelationshipType;
-
-import com.googlecode.s2hibernate.struts2.plugin.annotations.SessionTarget;
-import com.googlecode.s2hibernate.struts2.plugin.annotations.TransactionTarget;
-
-/**
- * Data Access Object class for {@link RelationshipType}s
- *
- * @author Thomas Lahn
- */
-public class RelationshipTypeDAO
-{
-
- /**
- * Hibernate session target
- */
- @SessionTarget
- Session session;
-
- /**
- * Hibernate transaction target
- */
- @TransactionTarget
- Transaction transaction;
-
- /**
- * Gets a list of all the relationshipTypes in the database.
- *
- * @return List of all the users. In case of a problem, an empty list is
- * returned.
- */
- @SuppressWarnings("unchecked")
- public List<RelationshipType> getList()
- {
-
- List<RelationshipType> relType = null;
-
- try
- {
- relType = this.session.createQuery("from RelationshipType").list(); //$NON-NLS-1$
- }
- catch (Exception e)
- {
- // TODO: Logging
- }
-
- if (relType == null)
- {
- relType = new ArrayList<RelationshipType>();
- }
-
- return relType;
- }
-
- /**
- * Saves or updates a relationship type
- *
- * @param relType
- * A filled domain object
- * @return Boolean indicating success or error in saving the relationshipType
- */
- public boolean saveOrUpdate(RelationshipType relType)
- {
- try
- {
- this.session.saveOrUpdate(relType);
- return true;
- }
- catch (Exception e)
- {
- this.transaction.rollback();
- return false;
- // TODO: Logging
- }
- }
-
- /**
- * Delete a relationship type
- *
- * @param relTypeId
- * Relationship type ID
- * @return boolean indicating success or error in the query execution
- */
- public boolean delete(int relTypeId)
- {
- try
- {
- RelationshipType relType = (RelationshipType) this.session.get(
- RelationshipType.class, relTypeId);
- this.session.delete(relType);
- return true;
- }
- catch (Exception e)
- {
- this.transaction.rollback();
- // TODO: Logging
- return false;
- }
- }
-
- /**
- * Used to get a relationship type by ID
- *
- * @param relTypeID
- * @return
- */
- public RelationshipType getById(int relTypeID)
- {
- RelationshipType relType = null;
- try
- {
- relType = (RelationshipType) this.session.get(RelationshipType.class,
- relTypeID);
- }
- catch (Exception e)
- {
- e.printStackTrace();
- // TODO: Logging
- }
- return relType;
- }
-}
/trunk/src/ch/ffhs/webE/dao/RelationshipTypeDAO.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/ch/ffhs/webE/domain/Term.java
===================================================================
--- trunk/src/ch/ffhs/webE/domain/Term.java (revision 38)
+++ trunk/src/ch/ffhs/webE/domain/Term.java (nonexistent)
@@ -1,165 +0,0 @@
-package ch.ffhs.webE.domain;
-
-// Generated 19.12.2010 14:46:08 by Hibernate Tools 3.4.0.Beta1
-
-import java.io.Serializable;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.PrimaryKeyJoinColumn;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-import javax.persistence.UniqueConstraint;
-
-import org.hibernate.annotations.GenericGenerator;
-import org.hibernate.annotations.Parameter;
-
-/**
- * Term generated by hbm2java
- */
-@Entity
-@Table(name = "term", catalog = "webengineering", uniqueConstraints = @UniqueConstraint(columnNames = "name"))
-public class Term implements Serializable
-{
- /**
- * Version ID for serialization
- */
- private static final long serialVersionUID = 1L;
-
- @Transient
- private int objectId;
-
- private ObjectEntity object;
- private String name;
- private Set<Relationship> relationshipsForTermTo = new HashSet<Relationship>(
- 0);
- private Set<Relationship> relationshipsForTermFrom = new HashSet<Relationship>(
- 0);
-
- /**
- * No-op constructor
- */
- public Term()
- {
- }
-
- /**
- * @param object
- */
- public Term(ObjectEntity object)
- {
- this.object = object;
- }
-
- /**
- * @param object
- * @param name
- * @param relationshipsForTermTo
- * @param relationshipsForTermFrom
- */
- public Term(ObjectEntity object, String name,
- Set<Relationship> relationshipsForTermTo,
- Set<Relationship> relationshipsForTermFrom)
- {
- this.object = object;
- this.name = name;
- this.relationshipsForTermTo = relationshipsForTermTo;
- this.relationshipsForTermFrom = relationshipsForTermFrom;
- }
-
- /**
- * @return
- */
- @GenericGenerator(name = "generator", strategy = "foreign", parameters = @Parameter(name = "property", value = "object"))
- @Id
- @GeneratedValue(generator = "generator")
- @Column(name = "object_id", unique = true, nullable = false)
- public int getObjectId()
- {
- return this.objectId;
- }
-
- /**
- * @param objectId
- */
- public void setObjectId(int objectId)
- {
- this.objectId = objectId;
- }
-
- /**
- * @return ObjectEntity domain object
- */
- @OneToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
- @PrimaryKeyJoinColumn
- public ObjectEntity getObject()
- {
- return this.object;
- }
-
- /**
- * @param object
- */
- public void setObject(ObjectEntity object)
- {
- this.object = object;
- }
-
- /**
- * @return
- */
- @Column(name = "name", unique = true)
- public String getName()
- {
- return this.name;
- }
-
- /**
- * @param name
- */
- public void setName(String name)
- {
- this.name = name;
- }
-
- @OneToMany(fetch = FetchType.LAZY, mappedBy = "termTo")
- public Set<Relationship> getRelationshipsForTermTo()
- {
- return this.relationshipsForTermTo;
- }
-
- /**
- * @param relationshipsForTermTo
- */
- public void setRelationshipsForTermTo(Set<Relationship> relationshipsForTermTo)
- {
- this.relationshipsForTermTo = relationshipsForTermTo;
- }
-
- /**
- * @return
- */
- @OneToMany(fetch = FetchType.LAZY, mappedBy = "termFrom")
- public Set<Relationship> getRelationshipsForTermFrom()
- {
- return this.relationshipsForTermFrom;
- }
-
- /**
- * @param relationshipsForTermFrom
- */
- public void setRelationshipsForTermFrom(
- Set<Relationship> relationshipsForTermFrom)
- {
- this.relationshipsForTermFrom = relationshipsForTermFrom;
- }
-
-}
/trunk/src/ch/ffhs/webE/domain/Term.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/ch/ffhs/webE/domain/ObjectType.java
===================================================================
--- trunk/src/ch/ffhs/webE/domain/ObjectType.java (revision 38)
+++ trunk/src/ch/ffhs/webE/domain/ObjectType.java (nonexistent)
@@ -1,92 +0,0 @@
-package ch.ffhs.webE.domain;
-
-// Generated 19.12.2010 14:46:08 by Hibernate Tools 3.4.0.Beta1
-
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
-
-/**
- * ObjectType generated by hbm2java
- */
-@Entity
-@Table(name = "object_type", catalog = "webengineering", uniqueConstraints = @UniqueConstraint(columnNames = "name"))
-public class ObjectType implements java.io.Serializable
-{
- /**
- * Version ID for serialization
- */
- private static final long serialVersionUID = 1L;
-
- /**
- * ObjectEntity type ID for a term
- */
- public static final int TERM = 1;
-
- /**
- * ObjectEntity type ID for a relationship
- */
- public static final int RELATIONSHIP = 2;
-
- private int id;
- private String name;
- private Set<ObjectEntity> objects = new HashSet<ObjectEntity>(0);
-
- public ObjectType()
- {
- }
-
- public ObjectType(int id)
- {
- this.id = id;
- }
-
- public ObjectType(int id, String name, Set<ObjectEntity> objects)
- {
- this.id = id;
- this.name = name;
- this.objects = objects;
- }
-
- @Id
- @Column(name = "id", unique = true, nullable = false)
- public int getId()
- {
- return this.id;
- }
-
- public void setId(int objectTypeId)
- {
- this.id = objectTypeId;
- }
-
- @Column(name = "name", unique = true, length = 45)
- public String getName()
- {
- return this.name;
- }
-
- public void setName(String name)
- {
- this.name = name;
- }
-
- @OneToMany(fetch = FetchType.LAZY, mappedBy = "objectType")
- public Set<ObjectEntity> getObjects()
- {
- return this.objects;
- }
-
- public void setObjects(Set<ObjectEntity> objects)
- {
- this.objects = objects;
- }
-
-}
/trunk/src/ch/ffhs/webE/domain/ObjectType.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/ch/ffhs/webE/domain/User.java
===================================================================
--- trunk/src/ch/ffhs/webE/domain/User.java (revision 38)
+++ trunk/src/ch/ffhs/webE/domain/User.java (nonexistent)
@@ -1,167 +0,0 @@
-package ch.ffhs.webE.domain;
-
-// Generated 19.12.2010 14:46:08 by Hibernate Tools 3.4.0.Beta1
-
-import static javax.persistence.GenerationType.IDENTITY;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
-
-/**
- * User generated by hbm2java
- */
-@Entity
-@Table(name = "user", catalog = "webengineering", uniqueConstraints = @UniqueConstraint(columnNames = "username"))
-public class User implements java.io.Serializable
-{
- /**
- * Version ID for serialization
- */
- private static final long serialVersionUID = 1L;
-
- private Integer id;
- private String username;
- private String password;
- private String firstname;
- private String lastname;
- private boolean admin;
- private Set<ObjectEntity> objectsForOwnerId = new HashSet<ObjectEntity>(0);
- private Set<ObjectEntity> objectsForEditorId = new HashSet<ObjectEntity>(0);
- private Set<History> histories = new HashSet<History>(0);
-
- public User()
- {
- }
-
- public User(String username, String password, boolean admin)
- {
- this.username = username;
- this.password = password;
- this.admin = admin;
- }
-
- public User(String username, String password, String firstname,
- String lastname, boolean admin, Set<ObjectEntity> objectsForOwnerId,
- Set<ObjectEntity> objectsForEditorId, Set<History> histories)
- {
- this.username = username;
- this.password = password;
- this.firstname = firstname;
- this.lastname = lastname;
- this.admin = admin;
- this.objectsForOwnerId = objectsForOwnerId;
- this.objectsForEditorId = objectsForEditorId;
- this.histories = histories;
- }
-
- @Id
- @GeneratedValue(strategy = IDENTITY)
- @Column(name = "id", unique = true, nullable = false)
- public Integer getId()
- {
- return this.id;
- }
-
- public void setId(Integer id)
- {
- this.id = id;
- }
-
- @Column(name = "username", unique = true, nullable = false)
- public String getUsername()
- {
- return this.username;
- }
-
- public void setUsername(String username)
- {
- this.username = username;
- }
-
- @Column(name = "password", nullable = false, length = 32)
- public String getPassword()
- {
- return this.password;
- }
-
- public void setPassword(String password)
- {
- this.password = password;
- }
-
- @Column(name = "firstname", length = 45)
- public String getFirstname()
- {
- return this.firstname;
- }
-
- public void setFirstname(String firstname)
- {
- this.firstname = firstname;
- }
-
- @Column(name = "lastname", length = 45)
- public String getLastname()
- {
- return this.lastname;
- }
-
- public void setLastname(String lastname)
- {
- this.lastname = lastname;
- }
-
- @Column(name = "admin", nullable = false)
- public boolean isAdmin()
- {
- return this.admin;
- }
-
- public void setAdmin(boolean admin)
- {
- this.admin = admin;
- }
-
- @OneToMany(fetch = FetchType.LAZY, mappedBy = "userByOwnerId")
- public Set<ObjectEntity> getObjectsForOwnerId()
- {
- return this.objectsForOwnerId;
- }
-
- public void setObjectsForOwnerId(Set<ObjectEntity> objectsForOwnerId)
- {
- this.objectsForOwnerId = objectsForOwnerId;
- }
-
- @OneToMany(fetch = FetchType.LAZY, mappedBy = "userByEditorId")
- public Set<ObjectEntity> getObjectsForEditorId()
- {
- return this.objectsForEditorId;
- }
-
- public void setObjectsForEditorId(Set<ObjectEntity> objectsForEditorId)
- {
- this.objectsForEditorId = objectsForEditorId;
- }
-
- @OneToMany(fetch = FetchType.LAZY, mappedBy = "user")
- public Set<History> getHistories()
- {
- return this.histories;
- }
-
- public void setHistories(Set<History> histories)
- {
- this.histories = histories;
- }
-
-}
/trunk/src/ch/ffhs/webE/domain/User.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/ch/ffhs/webE/domain/ActionType.java
===================================================================
--- trunk/src/ch/ffhs/webE/domain/ActionType.java (revision 38)
+++ trunk/src/ch/ffhs/webE/domain/ActionType.java (nonexistent)
@@ -1,97 +0,0 @@
-package ch.ffhs.webE.domain;
-
-// Generated 19.12.2010 14:46:08 by Hibernate Tools 3.4.0.Beta1
-
-import static javax.persistence.GenerationType.IDENTITY;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-
-/**
- * ActionType generated by hbm2java
- */
-@Entity
-@Table(name = "action_type", catalog = "webengineering")
-public class ActionType implements java.io.Serializable
-{
- /**
- * History action ID for adding an item
- */
- public static final int ADD = 1;
-
- /**
- * History action ID for renaming a term
- */
- public static final int RENAME = 2;
-
- /**
- * History action ID for modifying a relationship
- */
- public static final int MODIFY = 3;
-
- private int id;
- private String name;
- private Set<History> histories = new HashSet<History>(0);
-
- public ActionType()
- {
- }
-
- /**
- * @param id
- */
- public ActionType(int id)
- {
- this.setId(id);
- }
-
- public ActionType(String name, Set<History> histories)
- {
- this.setName(name);
- this.setHistories(histories);
- }
-
- @Id
- @GeneratedValue(strategy = IDENTITY)
- @Column(name = "id", unique = true, nullable = false)
- public int getId()
- {
- return this.id;
- }
-
- public void setId(int id)
- {
- this.id = id;
- }
-
- @Column(name = "name", length = 45)
- public String getName()
- {
- return this.name;
- }
-
- public void setName(String name)
- {
- this.name = name;
- }
-
- @OneToMany(fetch = FetchType.LAZY, mappedBy = "actionType")
- public Set<History> getHistories()
- {
- return this.histories;
- }
-
- public void setHistories(Set<History> histories)
- {
- this.histories = histories;
- }
-
-}
/trunk/src/ch/ffhs/webE/domain/ActionType.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/ch/ffhs/webE/domain/History.java
===================================================================
--- trunk/src/ch/ffhs/webE/domain/History.java (revision 38)
+++ trunk/src/ch/ffhs/webE/domain/History.java (nonexistent)
@@ -1,206 +0,0 @@
-package ch.ffhs.webE.domain;
-
-// Generated 19.12.2010 14:46:08 by Hibernate Tools 3.4.0.Beta1
-
-import static javax.persistence.GenerationType.IDENTITY;
-
-import java.util.Date;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-
-/**
- * History generated by hbm2java
- */
-@Entity
-@Table(name = "history", catalog = "webengineering")
-public class History implements java.io.Serializable
-{
- /**
- * Serialization version ID
- */
- private static final long serialVersionUID = 1L;
-
- private int id;
- private User user;
- private ActionType actionType;
- private ObjectEntity object;
- private String value;
- private String comment;
- private Date date;
-
- /**
- *
- */
- public History()
- {
- }
-
- /**
- * @param user
- * @param actionType
- * @param object
- * @param date
- */
- public History(User user, ActionType actionType, ObjectEntity object,
- Date date)
- {
- this.user = user;
- this.actionType = actionType;
- this.object = object;
- this.date = date;
- }
-
- /**
- * @param user
- * @param actionType
- * @param object
- * @param value
- * @param comment
- * @param date
- */
- public History(User user, ActionType actionType, ObjectEntity object,
- String value, String comment, Date date)
- {
- this.user = user;
- this.actionType = actionType;
- this.object = object;
- this.value = value;
- this.comment = comment;
- this.date = date;
- }
-
- /**
- * @return
- */
- @Id
- @GeneratedValue(strategy = IDENTITY)
- @Column(name = "id", unique = true, nullable = false)
- public int getId()
- {
- return this.id;
- }
-
- /**
- * @param id
- */
- public void setId(int id)
- {
- this.id = id;
- }
-
- /**
- * @return
- */
- @ManyToOne(fetch = FetchType.LAZY)
- @JoinColumn(name = "user_id", nullable = false)
- public User getUser()
- {
- return this.user;
- }
-
- /**
- * @param user
- */
- public void setUser(User user)
- {
- this.user = user;
- }
-
- /**
- * @return
- */
- @ManyToOne(fetch = FetchType.LAZY)
- @JoinColumn(name = "action_type_id", nullable = false)
- public ActionType getActionType()
- {
- return this.actionType;
- }
-
- /**
- * @param actionType
- */
- public void setActionType(ActionType actionType)
- {
- this.actionType = actionType;
- }
-
- /**
- * @return
- */
- @ManyToOne(fetch = FetchType.LAZY)
- @JoinColumn(name = "objects_id", nullable = false)
- public ObjectEntity getObject()
- {
- return this.object;
- }
-
- /**
- * @param object
- */
- public void setObject(ObjectEntity object)
- {
- this.object = object;
- }
-
- /**
- * @return
- */
- @Column(name = "value", length = 45)
- public String getValue()
- {
- return this.value;
- }
-
- /**
- * @param value
- */
- public void setValue(String value)
- {
- this.value = value;
- }
-
- /**
- * @return
- */
- @Column(name = "comment")
- public String getComment()
- {
- return this.comment;
- }
-
- /**
- * @param comment
- */
- public void setComment(String comment)
- {
- this.comment = comment;
- }
-
- /**
- * @return
- */
- @Temporal(TemporalType.TIMESTAMP)
- @Column(name = "date", nullable = false, length = 19)
- public Date getDate()
- {
- return this.date;
- }
-
- /**
- * @param date
- */
- public void setDate(Date date)
- {
- this.date = date;
- }
-
-}
/trunk/src/ch/ffhs/webE/domain/History.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/ch/ffhs/webE/domain/Relationship.java
===================================================================
--- trunk/src/ch/ffhs/webE/domain/Relationship.java (revision 38)
+++ trunk/src/ch/ffhs/webE/domain/Relationship.java (nonexistent)
@@ -1,113 +0,0 @@
-package ch.ffhs.webE.domain;
-
-// Generated 19.12.2010 14:46:08 by Hibernate Tools 3.4.0.Beta1
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToOne;
-import javax.persistence.PrimaryKeyJoinColumn;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-import javax.persistence.UniqueConstraint;
-
-import org.hibernate.annotations.GenericGenerator;
-import org.hibernate.annotations.Parameter;
-
-/**
- * Relationship generated by hbm2java
- */
-@Entity
-@Table(name = "relationship", catalog = "webengineering", uniqueConstraints = @UniqueConstraint(columnNames = {
- "term_from", "term_to", "type_id" }))
-public class Relationship implements java.io.Serializable
-{
- private int objectId;
-
- @Transient
- private ObjectEntity object;
-
- private Term termFrom;
- private Term termTo;
- private RelationshipType relationshipType;
-
- public Relationship()
- {
- }
-
- public Relationship(Term termByTermTo, ObjectEntity object,
- RelationshipType relationshipType, Term termByTermFrom)
- {
- this.termTo = termByTermTo;
- this.object = object;
- this.relationshipType = relationshipType;
- this.termFrom = termByTermFrom;
- }
-
- @GenericGenerator(name = "generator", strategy = "foreign", parameters = @Parameter(name = "property", value = "object"))
- @Id
- @GeneratedValue(generator = "generator")
- @Column(name = "object_id", unique = true, nullable = false)
- public int getObjectId()
- {
- return this.objectId;
- }
-
- public void setObjectId(int objectId)
- {
- this.objectId = objectId;
- }
-
- @ManyToOne(fetch = FetchType.LAZY)
- @JoinColumn(name = "term_to", nullable = false)
- public Term getTermTo()
- {
- return this.termTo;
- }
-
- public void setTermTo(Term termByTermTo)
- {
- this.termTo = termByTermTo;
- }
-
- @OneToOne(fetch = FetchType.LAZY)
- @PrimaryKeyJoinColumn
- public ObjectEntity getObject()
- {
- return this.object;
- }
-
- public void setObject(ObjectEntity object)
- {
- this.object = object;
- }
-
- @ManyToOne(fetch = FetchType.LAZY)
- @JoinColumn(name = "type_id", nullable = false)
- public RelationshipType getRelationshipType()
- {
- return this.relationshipType;
- }
-
- public void setRelationshipType(RelationshipType relationshipType)
- {
- this.relationshipType = relationshipType;
- }
-
- @ManyToOne(fetch = FetchType.LAZY)
- @JoinColumn(name = "term_from", nullable = false)
- public Term getTermFrom()
- {
- return this.termFrom;
- }
-
- public void setTermFrom(Term termByTermFrom)
- {
- this.termFrom = termByTermFrom;
- }
-
-}
/trunk/src/ch/ffhs/webE/domain/Relationship.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/ch/ffhs/webE/domain/RelationshipType.java
===================================================================
--- trunk/src/ch/ffhs/webE/domain/RelationshipType.java (revision 38)
+++ trunk/src/ch/ffhs/webE/domain/RelationshipType.java (nonexistent)
@@ -1,96 +0,0 @@
-package ch.ffhs.webE.domain;
-
-// Generated 19.12.2010 14:46:08 by Hibernate Tools 3.4.0.Beta1
-
-import static javax.persistence.GenerationType.IDENTITY;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
-
-/**
- * RelationshipType generated by hbm2java
- */
-@Entity
-@Table(name = "relationship_type", catalog = "webengineering", uniqueConstraints = @UniqueConstraint(columnNames = "name_from"))
-public class RelationshipType implements java.io.Serializable
-{
-
- private Integer id;
- private String nameFrom;
- private String nameTo;
- private Set<Relationship> relationships = new HashSet<Relationship>(0);
-
- public RelationshipType()
- {
- }
-
- public RelationshipType(String nameFrom, String nameTo)
- {
- this.nameFrom = nameFrom;
- this.nameTo = nameTo;
- }
-
- public RelationshipType(String nameFrom, String nameTo,
- Set<Relationship> relationships)
- {
- this.nameFrom = nameFrom;
- this.nameTo = nameTo;
- this.relationships = relationships;
- }
-
- @Id
- @GeneratedValue(strategy = IDENTITY)
- @Column(name = "id", unique = true, nullable = false)
- public Integer getId()
- {
- return this.id;
- }
-
- public void setId(Integer id)
- {
- this.id = id;
- }
-
- @Column(name = "name_from", unique = true, nullable = false)
- public String getNameFrom()
- {
- return this.nameFrom;
- }
-
- public void setNameFrom(String nameFrom)
- {
- this.nameFrom = nameFrom;
- }
-
- @Column(name = "name_to", nullable = false)
- public String getNameTo()
- {
- return this.nameTo;
- }
-
- public void setNameTo(String nameTo)
- {
- this.nameTo = nameTo;
- }
-
- @OneToMany(fetch = FetchType.LAZY, mappedBy = "relationshipType")
- public Set<Relationship> getRelationships()
- {
- return this.relationships;
- }
-
- public void setRelationships(Set<Relationship> relationships)
- {
- this.relationships = relationships;
- }
-
-}
/trunk/src/ch/ffhs/webE/domain/RelationshipType.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/ch/ffhs/webE/domain/ObjectEntity.java
===================================================================
--- trunk/src/ch/ffhs/webE/domain/ObjectEntity.java (revision 38)
+++ trunk/src/ch/ffhs/webE/domain/ObjectEntity.java (nonexistent)
@@ -1,275 +0,0 @@
-package ch.ffhs.webE.domain;
-
-// Generated 19.12.2010 14:46:08 by Hibernate Tools 3.4.0.Beta1
-
-import static javax.persistence.GenerationType.IDENTITY;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-
-import org.hibernate.annotations.OrderBy;
-
-/**
- * ObjectEntity generated by hbm2java
- */
-@Entity
-@Table(name = "object", catalog = "webengineering")
-public class ObjectEntity implements Serializable
-{
- /**
- * Version ID for serialization
- */
- private static final long serialVersionUID = 1L;
-
- /* Persistent fields */
- private Integer id;
- private User userByEditorId;
- private ObjectType objectType;
- private User userByOwnerId;
- private Date locked;
- private Date modified;
- private Boolean deleted;
- private Term term;
- private Set<History> history = new HashSet<History>(0);
- private Relationship relationship;
-
- /**
- *
- */
- public ObjectEntity()
- {
- }
-
- /**
- * @param userByEditorId
- * @param objectType
- * @param userByOwnerId
- */
- public ObjectEntity(User userByEditorId, ObjectType objectType,
- User userByOwnerId)
- {
- this.userByEditorId = userByEditorId;
- this.objectType = objectType;
- this.userByOwnerId = userByOwnerId;
- }
-
- /**
- * @param userByEditorId
- * @param objectType
- * @param userByOwnerId
- * @param locked
- * @param modified
- * @param deleted
- * @param term
- * @param history
- * @param relationship
- */
- public ObjectEntity(User userByEditorId, ObjectType objectType,
- User userByOwnerId, Date locked, Date modified, Boolean deleted,
- Term term, Set<History> histories, Relationship relationship)
- {
- this.userByEditorId = userByEditorId;
- this.objectType = objectType;
- this.userByOwnerId = userByOwnerId;
- this.locked = locked;
- this.modified = modified;
- this.deleted = deleted;
- this.term = term;
- this.history = histories;
- this.relationship = relationship;
- }
-
- /**
- * @return
- */
- @Id
- @GeneratedValue(strategy = IDENTITY)
- @Column(name = "id", unique = true, nullable = false)
- public Integer getId()
- {
- return this.id;
- }
-
- /**
- * @param id
- */
- public void setId(Integer id)
- {
- this.id = id;
- }
-
- /**
- * @return
- */
- @ManyToOne(fetch = FetchType.LAZY)
- @JoinColumn(name = "editor_id", nullable = false)
- public User getUserByEditorId()
- {
- return this.userByEditorId;
- }
-
- /**
- * @param userByEditorId
- */
- public void setUserByEditorId(User userByEditorId)
- {
- this.userByEditorId = userByEditorId;
- }
-
- /**
- * @return
- */
- @ManyToOne(fetch = FetchType.LAZY)
- @JoinColumn(name = "object_type_id", nullable = false)
- public ObjectType getObjectType()
- {
- return this.objectType;
- }
-
- /**
- * @param objectType
- */
- public void setObjectType(ObjectType objectType)
- {
- this.objectType = objectType;
- }
-
- /**
- * @return
- */
- @ManyToOne(fetch = FetchType.LAZY)
- @JoinColumn(name = "owner_id", nullable = false)
- public User getUserByOwnerId()
- {
- return this.userByOwnerId;
- }
-
- /**
- * @param userByOwnerId
- */
- public void setUserByOwnerId(User userByOwnerId)
- {
- this.userByOwnerId = userByOwnerId;
- }
-
- /**
- * @return
- */
- @Temporal(TemporalType.TIMESTAMP)
- @Column(name = "locked", length = 19)
- public Date getLocked()
- {
- return this.locked;
- }
-
- /**
- * @param locked
- */
- public void setLocked(Date locked)
- {
- this.locked = locked;
- }
-
- /**
- * @return
- */
- @Temporal(TemporalType.TIMESTAMP)
- @Column(name = "modified", length = 19)
- public Date getModified()
- {
- return this.modified;
- }
-
- /**
- * @param modified
- */
- public void setModified(Date modified)
- {
- this.modified = modified;
- }
-
- /**
- * @return
- */
- @Column(name = "deleted")
- public Boolean getDeleted()
- {
- return this.deleted;
- }
-
- /**
- * @param deleted
- */
- public void setDeleted(Boolean deleted)
- {
- this.deleted = deleted;
- }
-
- /**
- * @return
- */
- @OneToOne(fetch = FetchType.LAZY, mappedBy = "object")
- public Term getTerm()
- {
- return this.term;
- }
-
- /**
- * @param term
- */
- public void setTerm(Term term)
- {
- this.term = term;
- }
-
- /**
- * @return
- */
- @OneToMany(fetch = FetchType.LAZY, mappedBy = "object")
- @OrderBy(clause = "date DESC")
- public Set<History> getHistory()
- {
- return this.history;
- }
-
- /**
- * @param history
- */
- public void setHistory(Set<History> history)
- {
- this.history = history;
- }
-
- /**
- * @return
- */
- @OneToOne(fetch = FetchType.LAZY, mappedBy = "object")
- public Relationship getRelationship()
- {
- return this.relationship;
- }
-
- /**
- * @param relationship
- */
- public void setRelationship(Relationship relationship)
- {
- this.relationship = relationship;
- }
-
-}
/trunk/src/ch/ffhs/webE/domain/ObjectEntity.java
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/src/hibernate.cfg.xml
===================================================================
--- trunk/src/hibernate.cfg.xml (revision 38)
+++ trunk/src/hibernate.cfg.xml (nonexistent)
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-configuration PUBLIC
- "-//Hibernate/Hibernate Configuration DTD 3.0//EN"
- "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
-<hibernate-configuration>
- <session-factory>
- <property name="hibernate.connection.driver_class">com.mysql.jdbc.Driver</property>
-
- <property name="hibernate.connection.url">jdbc:mysql://localhost/webengineering</property>
- <property name="hibernate.connection.username">webEngineering</property>
- <property name="connection.password">ontologie</property>
-
- <property name="connection.pool_size">1</property>
- <property name="hibernate.dialect">org.hibernate.dialect.MySQLDialect</property>
-
- <!-- Print all generated SQL to the console -->
- <property name="show_sql">true</property>
- <property name="format_sql">true</property>
- <!-- <property name="connection.provider_class"> org.hibernate.connection.C3P0ConnectionProvider
- </property> -->
- <!-- C3P0 connection pool -->
- <property name="hibernate.c3p0.min_size">5</property>
- <property name="hibernate.c3p0.max_size">20</property>
- <property name="hibernate.c3p0.timeout">300</property>
- <property name="hibernate.c3p0.max_statements">50 </property>
- <property name="hibernate.c3p0.idle_test_period">3000 </property>
-
- <!--<property name="hbm2ddl.auto">create</property> -->
- <mapping class="ch.ffhs.webE.domain.ActionType" />
- <mapping class="ch.ffhs.webE.domain.History" />
- <mapping class="ch.ffhs.webE.domain.ObjectEntity" />
- <mapping class="ch.ffhs.webE.domain.ObjectType" />
- <mapping class="ch.ffhs.webE.domain.Relationship" />
- <mapping class="ch.ffhs.webE.domain.RelationshipType" />
- <mapping class="ch.ffhs.webE.domain.Term" />
- <mapping class="ch.ffhs.webE.domain.User" />
- </session-factory>
-</hibernate-configuration>
/trunk/src/hibernate.cfg.xml
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/hibernate.reveng.xml
===================================================================
--- trunk/hibernate.reveng.xml (revision 38)
+++ trunk/hibernate.reveng.xml (nonexistent)
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-reverse-engineering PUBLIC "-//Hibernate/Hibernate Reverse Engineering DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-reverse-engineering-3.0.dtd" >
-
-<hibernate-reverse-engineering>
- <table-filter match-catalog="webengineering" match-name="action_type" />
- <table-filter match-catalog="webengineering" match-name="history" />
- <table-filter match-catalog="webengineering" match-name="object" />
- <table-filter match-catalog="webengineering" match-name="object_type" />
- <table-filter match-catalog="webengineering" match-name="relationship" />
- <table-filter match-catalog="webengineering" match-name="relationship_type" />
- <table-filter match-catalog="webengineering" match-name="term" />
- <table-filter match-catalog="webengineering" match-name="user" />
-</hibernate-reverse-engineering>
\ No newline at end of file
/trunk/hibernate.reveng.xml
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/.classpath
===================================================================
--- trunk/.classpath (revision 38)
+++ trunk/.classpath (nonexistent)
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
- <attributes>
- <attribute name="owner.project.facets" value="java"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v6.0">
- <attributes>
- <attribute name="owner.project.facets" value="jst.web"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
- <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
- <classpathentry kind="output" path="WebContent/WEB-INF/classes"/>
-</classpath>
/trunk/.classpath
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/.settings/.jsdtscope
===================================================================
--- trunk/.settings/.jsdtscope (revision 38)
+++ trunk/.settings/.jsdtscope (nonexistent)
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="WebContent" />
- <classpathentry kind="con"
- path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER" />
- <classpathentry kind="con"
- path="org.eclipse.wst.jsdt.launching.WebProject">
- <attributes>
- <attribute name="hide" value="true" />
- </attributes>
- </classpathentry>
- <classpathentry kind="con"
- path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary" />
- <classpathentry kind="output" path="" />
-</classpath>
Index: trunk/.settings/org.eclipse.wst.common.component
===================================================================
--- trunk/.settings/org.eclipse.wst.common.component (revision 38)
+++ trunk/.settings/org.eclipse.wst.common.component (nonexistent)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
- <wb-module deploy-name="WebEngineeringProject">
- <wb-resource deploy-path="/" source-path="/WebContent"/>
- <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
- <property name="context-root" value="WebEngineeringProject"/>
- <property name="java-output-path" value="/WebEngineeringProject/build/classes"/>
- </wb-module>
-</project-modules>
Index: trunk/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/.settings/org.eclipse.jdt.core.prefs (revision 38)
+++ trunk/.settings/org.eclipse.jdt.core.prefs (nonexistent)
@@ -1,283 +0,0 @@
-#Wed Dec 29 00:20:56 CET 2010
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=next_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
-org.eclipse.jdt.core.formatter.indentation.size=8
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=true
-org.eclipse.jdt.core.formatter.join_wrapped_lines=true
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=80
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=space
-org.eclipse.jdt.core.formatter.tabulation.size=2
-org.eclipse.jdt.core.formatter.use_on_off_tags=false
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
/trunk/.settings/org.eclipse.jdt.core.prefs
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/.settings/org.eclipse.wst.jsdt.ui.superType.name
===================================================================
--- trunk/.settings/org.eclipse.wst.jsdt.ui.superType.name (revision 38)
+++ trunk/.settings/org.eclipse.wst.jsdt.ui.superType.name (nonexistent)
@@ -1 +0,0 @@
-Window
\ No newline at end of file
Index: trunk/.settings/org.eclipse.jdt.ui.prefs
===================================================================
--- trunk/.settings/org.eclipse.jdt.ui.prefs (revision 38)
+++ trunk/.settings/org.eclipse.jdt.ui.prefs (nonexistent)
@@ -1,4 +0,0 @@
-#Mon Dec 20 19:01:00 CET 2010
-eclipse.preferences.version=1
-formatter_profile=_WebEngineeringProject
-formatter_settings_version=12
/trunk/.settings/org.eclipse.jdt.ui.prefs
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/.settings/org.eclipse.wst.jsdt.ui.superType.container
===================================================================
--- trunk/.settings/org.eclipse.wst.jsdt.ui.superType.container (revision 38)
+++ trunk/.settings/org.eclipse.wst.jsdt.ui.superType.container (nonexistent)
@@ -1 +0,0 @@
-org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
Index: trunk/.settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs
===================================================================
--- trunk/.settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs (revision 38)
+++ trunk/.settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs (nonexistent)
@@ -1,6 +0,0 @@
-#Tue Dec 07 00:32:20 CET 2010
-XDOCLETBUILDERACTIVE=true
-XDOCLETHOME=
-XDOCLETUSEGLOBAL=true
-XDOCLETVERSION=1.2.1
-eclipse.preferences.version=1
/trunk/.settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/.settings/org.eclipse.wst.common.project.facet.core.xml
===================================================================
--- trunk/.settings/org.eclipse.wst.common.project.facet.core.xml (revision 38)
+++ trunk/.settings/org.eclipse.wst.common.project.facet.core.xml (nonexistent)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
- <runtime name="Apache Tomcat v6.0" />
- <fixed facet="jst.web" />
- <fixed facet="java" />
- <installed facet="java" version="1.6" />
- <installed facet="jst.web" version="2.5" />
- <installed facet="wst.jsdt.web" version="1.0" />
-</faceted-project>
/trunk/.settings/org.eclipse.wst.common.project.facet.core.xml
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/.settings/org.eclipse.wst.ws.service.policy.prefs
===================================================================
--- trunk/.settings/org.eclipse.wst.ws.service.policy.prefs (revision 38)
+++ trunk/.settings/org.eclipse.wst.ws.service.policy.prefs (nonexistent)
@@ -1,3 +0,0 @@
-#Sun Dec 05 22:00:33 CET 2010
-eclipse.preferences.version=1
-org.eclipse.wst.ws.service.policy.projectEnabled=false
/trunk/.settings/org.eclipse.wst.ws.service.policy.prefs
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/.settings/org.eclipse.ltk.core.refactoring.prefs
===================================================================
--- trunk/.settings/org.eclipse.ltk.core.refactoring.prefs (revision 38)
+++ trunk/.settings/org.eclipse.ltk.core.refactoring.prefs (nonexistent)
@@ -1,3 +0,0 @@
-#Sun Dec 05 22:00:33 CET 2010
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
/trunk/.settings/org.eclipse.ltk.core.refactoring.prefs
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/hibernate.properties
===================================================================
--- trunk/hibernate.properties (revision 38)
+++ trunk/hibernate.properties (nonexistent)
/trunk/hibernate.properties
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk
===================================================================
--- trunk (revision 38)
+++ trunk (revision 1)
/trunk
Property changes:
Deleted: svn:ignore
## -1,5 +0,0 ##
-svn history.txt
-
-hibernate.reveng.xml
-
-hibernate.properties