Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' of git://github.com/DSpace/DSpace

  • Loading branch information...
commit 57b2ab356f8050b7c1cf91ca14ea946542c7e1e0 2 parents bb555ea + 77a685f
@tdonohue tdonohue authored
Showing with 423 additions and 65 deletions.
  1. +1 −0  .gitignore
  2. +3 −3 dspace-api/src/main/java/org/dspace/content/InstallItem.java
  3. +8 −8 dspace-api/src/main/java/org/dspace/content/crosswalk/XSLTDisseminationCrosswalk.java
  4. +10 −0 dspace-oai/dspace-oai-webapp/pom.xml
  5. +339 −0 dspace-oai/dspace-oai-webapp/src/main/webapp/oai2.xsl.LICENSE
  6. +5 −9 dspace-stats/pom.xml
  7. +0 −2  dspace-stats/src/test/java/org/dspace/statistics/util/TestLocationUtils.java
  8. +1 −1  dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/cocoon/DSpaceI18NTransformer.java
  9. +16 −16 dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/objectmanager/AbstractAdapter.java
  10. +7 −7 dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/WEB-INF/cocoon/properties/core.properties
  11. +2 −2 dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/themes/Mirage/lib/xsl/aspect/artifactbrowser/item-view.xsl
  12. +4 −4 dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/themes/Mirage/lib/xsl/core/page-structure.xsl
  13. +4 −4 dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/themes/dri2xhtml-alt/core/page-structure.xsl
  14. +3 −3 dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/themes/dri2xhtml/structural.xsl
  15. +3 −3 dspace/config/modules/oai.cfg
  16. +3 −3 dspace/config/news-xmlui.xml
  17. +7 −0 dspace/modules/additions/src/main/java/org/dspace/example/Example.java
  18. +7 −0 dspace/modules/additions/src/main/java/org/dspace/example/impl/ExampleImpl.java
View
1  .gitignore
@@ -15,3 +15,4 @@ dist/
nbdist/
nbactions.xml
nb-configuration.xml
+META-INF/
View
6 dspace-api/src/main/java/org/dspace/content/InstallItem.java
@@ -123,12 +123,12 @@ public static Item restoreItem(Context c, InProgressSubmission is,
handle = HandleManager.createHandle(c, item, suppliedHandle);
}
- // Even though we are restoring an item it may not have a have the proper dates. So lets
+ // Even though we are restoring an item it may not have the proper dates. So let's
// double check that it has a date accessioned and date issued, and if either of those dates
// are not set then set them to today.
DCDate now = DCDate.getCurrent();
- // If the item doesn't have a date.accessioned create one.
+ // If the item doesn't have a date.accessioned, create one.
DCValue[] dateAccessioned = item.getDC("date", "accessioned", Item.ANY);
if (dateAccessioned.length == 0)
{
@@ -251,7 +251,7 @@ private static Item finishItem(Context c, Item item, InProgressSubmission is, DC
* Generate provenance-worthy description of the bitstreams contained in an
* item.
*
- * @param myitem the item generate description for
+ * @param myitem the item to generate description for
*
* @return provenance description
*/
View
16 dspace-api/src/main/java/org/dspace/content/crosswalk/XSLTDisseminationCrosswalk.java
@@ -380,10 +380,10 @@ else if (dso.getType() == Constants.SITE)
/**
* Create a new DIM field element with the given attributes.
*
- * @param schema The schema the DIM field belongs too.
- * @param element The element the DIM field belongs too.
- * @param qualifier The qualifier the DIM field belongs too.
- * @param language The language the DIM field belongs too.
+ * @param schema The schema the DIM field belongs to.
+ * @param element The element the DIM field belongs to.
+ * @param qualifier The qualifier the DIM field belongs to.
+ * @param language The language the DIM field belongs to.
* @param value The value of the DIM field.
* @return A new DIM field element
*/
@@ -395,10 +395,10 @@ private static Element createField(String schema, String element, String qualifi
/**
* Create a new DIM field element with the given attributes.
*
- * @param schema The schema the DIM field belongs too.
- * @param element The element the DIM field belongs too.
- * @param qualifier The qualifier the DIM field belongs too.
- * @param language The language the DIM field belongs too.
+ * @param schema The schema the DIM field belongs to.
+ * @param element The element the DIM field belongs to.
+ * @param qualifier The qualifier the DIM field belongs to.
+ * @param language The language the DIM field belongs to.
* @param value The value of the DIM field.
* @param authority The authority
* @param confidence confidence in the authority
View
10 dspace-oai/dspace-oai-webapp/pom.xml
@@ -43,6 +43,16 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>com.mycila.maven-license-plugin</groupId>
+ <artifactId>maven-license-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/*.LICENSE</exclude>
+ <exclude>src/main/webapp/oai2.xsl</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
</plugins>
</build>
View
339 dspace-oai/dspace-oai-webapp/src/main/webapp/oai2.xsl.LICENSE
@@ -0,0 +1,339 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ 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 General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
View
14 dspace-stats/pom.xml
@@ -195,15 +195,11 @@
<type>jar</type>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.dspace</groupId>
- <artifactId>dspace-api</artifactId>
- <version>${project.version}</version>
- <type>jar</type>
- <classifier>tests</classifier>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ </dependency>
+ </dependencies>
<reporting>
<excludeDefaults>false</excludeDefaults>
View
2  dspace-stats/src/test/java/org/dspace/statistics/util/TestLocationUtils.java
@@ -10,7 +10,6 @@
import java.util.Locale;
import static org.junit.Assert.*;
-import org.dspace.AbstractUnitTest;
import org.dspace.core.I18nUtil;
import org.junit.Test;
@@ -18,7 +17,6 @@
* @author mwood
*/
public class TestLocationUtils
-extends AbstractUnitTest
{
private static final String UNKNOWN_CONTINENT = I18nUtil
.getMessage("org.dspace.statistics.util.LocationUtils.unknown-continent");
View
2  ...lui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/cocoon/DSpaceI18NTransformer.java
@@ -34,7 +34,7 @@
*
* EXAMPLE:
*
- * For instance let's say there the i18n transformer's configuration
+ * For instance let's say that the i18n transformer's configuration
* were as follows:
* <catalogues default="default">
* <catalogue id="default" name="messages" aspects="true">
View
32 ...ui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/objectmanager/AbstractAdapter.java
@@ -39,7 +39,7 @@
* into the DRI document.
*
* This class provides the chassis for those unique parts of the document to be
- * build upon, there are seven rendering methods that may be overridden for each
+ * built upon. There are seven rendering methods that may be overridden for each
* section of the METS document.
*
* Header
@@ -85,7 +85,7 @@
protected NamespaceSupport namespaces;
/**
- * Construct a new adapter, implementers must use call this method so
+ * Construct a new adapter, implementers must call this method so
* the appropriate internal values are ensured to be set correctly.
*
* @param contextPath
@@ -147,7 +147,7 @@ public final void setDmdTypes(String dmdTypes)
*
* @param amdSec Section of <amdSec> where this administrative metadata
* will be rendered
- * @param mdTypes Comma separated list of METS metadata types.
+ * @param mdTypes Comma-separated list of METS metadata types.
*/
public final void setAmdTypes(String amdSec, String mdTypes)
{
@@ -169,7 +169,7 @@ public final void setAmdTypes(String amdSec, String mdTypes)
* A comma-separated list of METS technical metadata formats to
* render.
*
- * @param techMDTypes Comma separated list of METS metadata types.
+ * @param techMDTypes Comma-separated list of METS metadata types.
*/
public final void setTechMDTypes(String techMDTypes)
{
@@ -180,7 +180,7 @@ public final void setTechMDTypes(String techMDTypes)
* A comma-separated list of METS intellectual property rights metadata
* formats to render.
*
- * @param rightsMDTypes Comma separated list of METS metadata types.
+ * @param rightsMDTypes Comma-separated list of METS metadata types.
*/
public final void setRightsMDTypes(String rightsMDTypes)
{
@@ -191,7 +191,7 @@ public final void setRightsMDTypes(String rightsMDTypes)
* A comma-separated list of METS source metadata
* formats to render.
*
- * @param sourceMDTypes Comma separated list of METS metadata types.
+ * @param sourceMDTypes Comma-separated list of METS metadata types.
*/
public final void setSourceMDTypes(String sourceMDTypes)
{
@@ -202,7 +202,7 @@ public final void setSourceMDTypes(String sourceMDTypes)
* A comma-separated list of METS digital provenance metadata
* formats to render.
*
- * @param digiprovMDTypes Comma separated list of METS metadata types.
+ * @param digiprovMDTypes Comma-separated list of METS metadata types.
*/
public final void setDigiProvMDTypes(String digiprovMDTypes)
{
@@ -213,7 +213,7 @@ public final void setDigiProvMDTypes(String digiprovMDTypes)
* A comma-separated list of METS fileGrps to render. If no value
* is provided then all groups are rendered.
*
- * @param fileGrpTypes Comma separated list of METS file groups.
+ * @param fileGrpTypes Comma-separated list of METS file groups.
*/
public final void setFileGrpTypes(String fileGrpTypes)
{
@@ -232,7 +232,7 @@ public final void setFileGrpTypes(String fileGrpTypes)
* A comma-separated list of METS structural types to render. If no
* value is provided then only the DIM format is used.
*
- * @param structTypes Comma separated list of METS structure types.
+ * @param structTypes Comma-separated list of METS structure types.
*/
public final void setStructTypes(String structTypes)
{
@@ -270,7 +270,7 @@ public final void setStructTypes(String structTypes)
protected abstract String getMETSOBJID() throws WingException;
/**
- * @return Return the URL for editing this item
+ * @return the URL for editing this item
*/
protected abstract String getMETSOBJEDIT();
@@ -280,7 +280,7 @@ public final void setStructTypes(String structTypes)
protected abstract String getMETSID() throws WingException;
/**
- * @return The Profile this METS document conforms too.
+ * @return The Profile this METS document conforms to.
*/
protected abstract String getMETSProfile() throws WingException;
@@ -414,7 +414,7 @@ protected final void renderFile(Item item, Bitstream bitstream, String fileID, S
* Generate a METS file element for a given bitstream.
*
* @param item
- * If the bitstream is associated with an item provide the item
+ * If the bitstream is associated with an item, provide the item,
* otherwise leave null.
* @param bitstream
* The bitstream to build a file element for.
@@ -471,7 +471,7 @@ protected final void renderFile(Item item, Bitstream bitstream, String fileID, S
String description = bitstream.getDescription();
- // If possible reference this bitstream via a handle, however this may
+ // If possible, reference this bitstream via a handle, however this may
// be null if a handle has not yet been assigned. In this case reference the
// item its internal id. In the last case where the bitstream is not associated
// with an item (such as a community logo) then reference the bitstreamID directly.
@@ -492,7 +492,7 @@ else if (item != null)
String url = contextPath + "/bitstream/"+identifier+"/";
- // If we can put the pretty name of the bitstream on the end of the URL
+ // If we can, append the pretty name of the bitstream to the URL
try
{
if (bitstream.getName() != null)
@@ -503,7 +503,7 @@ else if (item != null)
catch (UnsupportedEncodingException uee)
{
// just ignore it, we don't have to have a pretty
- // name on the end of the URL because the sequence id will
+ // name at the end of the URL because the sequence id will
// locate it. However it means that links in this file might
// not work....
}
@@ -667,7 +667,7 @@ protected final void endElement(Namespace namespace, String name)
* SAX Helper class to keep track of namespaces able to determine
* the correct prefix for a given namespace URI.
* @param attributes
- * An existing SAX AttributesImpl object to add attributes too.
+ * An existing SAX AttributesImpl object to add attributes to.
* If the value is null then a new attributes object will be
* created to house the attributes.
* @param attributeMap
View
14 dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/WEB-INF/cocoon/properties/core.properties
@@ -2,8 +2,8 @@
# The check is only performed if reloading is turned on!
org.apache.cocoon.reload-delay=1000
-# Allow reinstatiating (reloading) of the cocoon instance. If this is
-# set to "true", a new cocoon instance can be created using
+# Allow reinstatiating (reloading) of the Cocoon instance. If this is
+# set to "true", a new Cocoon instance can be created using
# the request parameter "cocoon-reload". It also enables that Cocoon is
# reloaded when cocoon.xconf changes. Default is false for security reasons.
# You can enable this for faster testing.
@@ -22,7 +22,7 @@ org.apache.cocoon.uploads.enable=true
# This parameter allows to specify where Cocoon should put uploaded files.
# The path specified can be either absolute or relative to the context
-# path of the servlet. On windows platform, absolute directory must start
+# path of the servlet. On the Windows platform, absolute directory must start
# with volume: C:\Path\To\Upload\Directory
#
# The default directory is "upload-dir" in the work-directory
@@ -41,12 +41,12 @@ org.apache.cocoon.uploads.overwrite=rename
# Specify maximum allowed size of the upload. Defaults to 10 Mb.
# DSpace Community: 2GB. The HTTP spec allows this to be increased to 4GB but
-# cocoon places a limit because the parameter is read into a signed integer.
+# Cocoon places a limit because the parameter is read into a signed integer.
org.apache.cocoon.uploads.maxsize=2147483647
# This parameter allows to specify where Cocoon should create its page
# and other objects cache. The path specified can be either absolute or
-# relative to the context path of the servlet. On windows platform,
+# relative to the context path of the servlet. On the Windows platform,
# absolute directory must start with volume: C:\Path\To\Cache\Directory
#
# The default directory is "cache-dir" in the work-directory.
@@ -54,7 +54,7 @@ org.apache.cocoon.uploads.maxsize=2147483647
# This parameter allows to specify where Cocoon should put it's
# working files. The path specified is either absolute or relative
-# to the context path of the Cocoon servlet. On windows platform,
+# to the context path of the Cocoon servlet. On the Windows platform,
# absolute directory must start with volume: C:\Path\To\Work\Directory
#
# The default directory is "cocoon-files" directory in the servlet
@@ -76,7 +76,7 @@ org.apache.cocoon.uploads.maxsize=2147483647
# time to the end of each response. Value 'hide' adds processing time as an
# HTML comment. By default, processing time is not added (corresponds to
# value 'false').
-# NOTE: If you use this feature, Cocoon might generated a wrong content
+# NOTE: If you use this feature, Cocoon might generate a wrong content
# length header in the response. This is due to the internal processing
# of Readers and the Caching. So, this might be the reason if you get
# a warning about a wrong content length.
View
4 ...e-xmlui-webapp/src/main/webapp/themes/Mirage/lib/xsl/aspect/artifactbrowser/item-view.xsl
@@ -348,12 +348,12 @@
</tr>
</xsl:template>
- <!--dont render the item-view-toggle automatically in the summary view, only when it get's called-->
+ <!-- don't render the item-view-toggle automatically in the summary view, only when it gets called -->
<xsl:template match="dri:p[contains(@rend , 'item-view-toggle') and
(preceding-sibling::dri:referenceSet[@type = 'summaryView'] or following-sibling::dri:referenceSet[@type = 'summaryView'])]">
</xsl:template>
- <!-- dont render the head on the item view page -->
+ <!-- don't render the head on the item view page -->
<xsl:template match="dri:div[@n='item-view']/dri:head" priority="5">
</xsl:template>
View
8 ...e-xmlui/dspace-xmlui-webapp/src/main/webapp/themes/Mirage/lib/xsl/core/page-structure.xsl
@@ -219,12 +219,12 @@
<!-- The following javascript removes the default text of empty text areas when they are focused on or submitted -->
<!-- There is also javascript to disable submitting a form when the 'enter' key is pressed. -->
<script type="text/javascript">
- //Clear default text of emty text areas on focus
+ //Clear default text of empty text areas on focus
function tFocus(element)
{
if (element.value == '<i18n:text>xmlui.dri2xhtml.default.textarea.value</i18n:text>'){element.value='';}
}
- //Clear default text of emty text areas on submit
+ //Clear default text of empty text areas on submit
function tSubmit(form)
{
var defaultedElements = document.getElementsByTagName("textarea");
@@ -329,7 +329,7 @@
</a>
<h1 class="pagetitle visuallyhidden">
<xsl:choose>
- <!-- protectiotion against an empty page title -->
+ <!-- protection against an empty page title -->
<xsl:when test="not(/dri:document/dri:meta/dri:pageMeta/dri:metadata[@element='title'])">
<xsl:text> </xsl:text>
</xsl:when>
@@ -652,7 +652,7 @@
</xsl:attribute>&#160;</script>
</xsl:for-each>
- <!-- add "shared" javascript from static, path is relative to webapp root-->
+ <!-- add "shared" javascript from static, path is relative to webapp root -->
<xsl:for-each select="/dri:document/dri:meta/dri:pageMeta/dri:metadata[@element='javascript'][@qualifier='static']">
<!--This is a dirty way of keeping the scriptaculous stuff from choice-support
out of our theme without modifying the administrative and submission sitemaps.
View
8 ...ce-xmlui/dspace-xmlui-webapp/src/main/webapp/themes/dri2xhtml-alt/core/page-structure.xsl
@@ -165,12 +165,12 @@
<!-- The following javascript removes the default text of empty text areas when they are focused on or submitted -->
<!-- There is also javascript to disable submitting a form when the 'enter' key is pressed. -->
<script type="text/javascript">
- //Clear default text of emty text areas on focus
+ //Clear default text of empty text areas on focus
function tFocus(element)
{
if (element.value == '<i18n:text>xmlui.dri2xhtml.default.textarea.value</i18n:text>'){element.value='';}
}
- //Clear default text of emty text areas on submit
+ //Clear default text of empty text areas on submit
function tSubmit(form)
{
var defaultedElements = document.getElementsByTagName("textarea");
@@ -207,7 +207,7 @@
</xsl:attribute>&#160;</script>
</xsl:for-each>
- <!-- add "shared" javascript from static, path is relative to webapp root-->
+ <!-- add "shared" javascript from static, path is relative to webapp root -->
<xsl:for-each select="/dri:document/dri:meta/dri:pageMeta/dri:metadata[@element='javascript'][@qualifier='static']">
<script type="text/javascript">
<xsl:attribute name="src">
@@ -278,7 +278,7 @@
</a>
<h1 class="pagetitle">
<xsl:choose>
- <!-- protectiotion against an empty page title -->
+ <!-- protection against an empty page title -->
<xsl:when test="not(/dri:document/dri:meta/dri:pageMeta/dri:metadata[@element='title'])">
<xsl:text> </xsl:text>
</xsl:when>
View
6 dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/themes/dri2xhtml/structural.xsl
@@ -199,12 +199,12 @@
<!-- The following javascript removes the default text of empty text areas when they are focused on or submitted -->
<!-- There is also javascript to disable submitting a form when the 'enter' key is pressed. -->
<script type="text/javascript">
- //Clear default text of emty text areas on focus
+ //Clear default text of empty text areas on focus
function tFocus(element)
{
if (element.value == '<i18n:text>xmlui.dri2xhtml.default.textarea.value</i18n:text>'){element.value='';}
}
- //Clear default text of emty text areas on submit
+ //Clear default text of empty text areas on submit
function tSubmit(form)
{
var defaultedElements = document.getElementsByTagName("textarea");
@@ -241,7 +241,7 @@
</xsl:attribute>&#160;</script>
</xsl:for-each>
- <!-- add "shared" javascript from static, path is relative to webapp root-->
+ <!-- add "shared" javascript from static, path is relative to webapp root -->
<xsl:for-each select="/dri:document/dri:meta/dri:pageMeta/dri:metadata[@element='javascript'][@qualifier='static']">
<script type="text/javascript">
<xsl:attribute name="src">
View
6 dspace/config/modules/oai.cfg
@@ -17,7 +17,7 @@ dspace.oai.url = ${dspace.baseUrl}/oai
# Max response size for DIDL. This is the maximum size in bytes of the files you
# wish to enclose Base64 encoded in your responses, remember that the base64
# encoding process uses a lot of memory. We recommend at most 200000 for answers
-# of 30 records each on a 1 Gigabyte machine. Ultimately this will change to a
+# of 30 records each on a 1 Gigabyte machine. Ultimately, this will change to a
# streaming model and remove this restriction. Also please remember to allocate
# plenty of memory, at least 512 MB to your Tomcat.
#
@@ -37,7 +37,7 @@ response.max-records = 100
### Harvester settings
-# Crosswalk settings; the {name} value must correspond to a declated ingestion crosswalk
+# Crosswalk settings; the {name} value must correspond to a declared ingestion crosswalk
# harvester.oai.metadataformats.{name} = {namespace},{optional display name}
# The display name is only used in the xmlui for the jspui there are entries in the
# Messages.properties in the form jsp.tools.edit-collection.form.label21.select.{name}
@@ -60,7 +60,7 @@ harvester.autoStart=false
#harvester.timePadding = 120
# How frequently the harvest scheduler checks the remote provider for updates,
-# messured in minutes. The default vaule is 12 hours (or 720 minutes)
+# measured in minutes. The default value is 12 hours (or 720 minutes)
#harvester.harvestFrequency = 720
# The heartbeat is the frequency at which the harvest scheduler queries the local
View
6 dspace/config/news-xmlui.xml
@@ -2,8 +2,8 @@
<document xmlns="http://di.tamu.edu/DRI/1.0/" xmlns:i18n="http://apache.org/cocoon/i18n/2.1" version="1.1">
<body>
<div id="file.news.div.news" n="news" rend="primary">
-<head>DSpace/Manakin Repository</head>
-<p>Welcome to the new Manakin interface to the DSpace digital repository. DSpace is a digital service that collects, preserves, and distributes digital material. Repositories are important tools for preserving an organization&apos;s legacy; they facilitate digital preservation and scholarly communication.</p>
+<head>DSpace Repository</head>
+<p>DSpace is a digital service that collects, preserves, and distributes digital material. Repositories are important tools for preserving an organization&apos;s legacy; they facilitate digital preservation and scholarly communication.</p>
</div>
</body>
<options/>
@@ -12,4 +12,4 @@
<pageMeta/>
<repositoryMeta/>
</meta>
-</document>
+</document>
View
7 dspace/modules/additions/src/main/java/org/dspace/example/Example.java
@@ -1,3 +1,10 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
package org.dspace.example;
/**
View
7 dspace/modules/additions/src/main/java/org/dspace/example/impl/ExampleImpl.java
@@ -1,3 +1,10 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
package org.dspace.example.impl;
import org.dspace.example.Example;
Please sign in to comment.
Something went wrong with that request. Please try again.