Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .classpath
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="C:/app/ITSC/product/11.2.0/dbhome_1/jdbc/lib/ojdbc6.jar">
<classpathentry kind="lib" path="C:/oracle/product/11.2.0/dbhome_1/jdbc/lib/ojdbc6.jar">
<attributes>
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes>
Expand Down
4 changes: 4 additions & 0 deletions .settings/org.eclipse.jdt.core.prefs
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
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.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.source=1.6
28 changes: 19 additions & 9 deletions .settings/org.eclipse.wst.common.component
Original file line number Diff line number Diff line change
@@ -1,19 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">



<wb-module deploy-name="MiniProject">



<wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>



<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>



<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>



<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>

<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/java"/>


<property name="java-output-path" value="target/classes"/>



<property name="context-root" value="biz"/>

</wb-module>


</wb-module>


</project-modules>
4 changes: 4 additions & 0 deletions miniproject.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
select * from tab;
create table test1 (
id number(5) not null
);
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package com.miniproject.board.controller;

import java.io.IOException;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;


public class NoticeBoardController extends HttpServlet {


protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {

}

protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {

}

}
4 changes: 2 additions & 2 deletions src/main/java/com/miniproject/connect/JDBCUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@

public class JDBCUtil {
public static void main(String[] args) {
// 1단계 : 데이터 베이스 연결
// 1단계 : 데1이터 베이스 연결
try {
// 1단계 : 데이터 베이스 연결
Class.forName("oracle.jdbc.driver.OracleDriver");

// 2단계 : 연결을 관리하는 객체 생성
String url = "jdbc:oracle:thin:@localhost:1521:orcl";
String id = "MiniProject";
String id = "miniproject";
String pass = "1234";

Connection conn = DriverManager.getConnection(url, id, pass);
Expand Down
4 changes: 4 additions & 0 deletions src/main/webapp/WEB-INF/views/home.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@
</head>
<body>
<h1>
<<<<<<< HEAD
Hello world! 1234
=======
Hello world! 333
>>>>>>> branch 'master' of https://github.com/jeongin9/MiniProject.git
</h1>

<P> The time on the server is ${serverTime}. </P>
Expand Down
12 changes: 12 additions & 0 deletions src/main/webapp/WEB-INF/views/test.jsp
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<%@ page language="java" contentType="text/html; charset=UTF-8"
pageEncoding="UTF-8"%>
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<title>Insert title here</title>
</head>
<body>

</body>
</html>
10 changes: 10 additions & 0 deletions src/main/webapp/WEB-INF/web.xml
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,14 @@
<servlet-name>DispacherServlet</servlet-name>
<url-pattern>*.do</url-pattern>
</servlet-mapping>
<servlet>
<description></description>
<display-name>NoticeBoardController</display-name>
<servlet-name>NoticeBoardController</servlet-name>
<servlet-class>com.miniproject.board.controller.NoticeBoardController</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>NoticeBoardController</servlet-name>
<url-pattern>/NoticeBoardController.do</url-pattern>
</servlet-mapping>
</web-app>
Loading